From df49c60c9671e4a28e636964d744c1f59fb6cb68 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Mon, 12 Jun 2000 15:00:15 +0000 Subject: Merged from 4.5.0-beta3a --- scripts/gccnewlib/.cvsignore | 3 + scripts/gccnewlib/Makefile.am | 62 +++++++++-------- scripts/gccnewlib/README | 8 +++ scripts/gccnewlib/base-chill.add | 38 ++++++++++ scripts/gccnewlib/base-g77.add | 42 +++++++++++ scripts/gccnewlib/base-gcc.add | 52 ++++++++++++++ scripts/gccnewlib/base-gcj.add | 20 ++++++ scripts/gccnewlib/gccnewlib.add | 138 +++++++++++++++++++++++++++++++++++++ scripts/gccnewlib/target-chill.add | 18 +++++ scripts/gccnewlib/target-g77.add | 19 +++++ scripts/gccnewlib/target-gcc.add | 28 ++++++++ scripts/gccnewlib/target-gcj.add | 21 ++++++ scripts/gccnewlib/target-objc.add | 17 +++++ 13 files changed, 437 insertions(+), 29 deletions(-) create mode 100644 scripts/gccnewlib/README (limited to 'scripts/gccnewlib') diff --git a/scripts/gccnewlib/.cvsignore b/scripts/gccnewlib/.cvsignore index 03dfe26135..ec9045cdae 100644 --- a/scripts/gccnewlib/.cvsignore +++ b/scripts/gccnewlib/.cvsignore @@ -1,4 +1,7 @@ +*.spec Makefile Makefile.in gccnewlib.spec +gccnewlib.spec.in gccnewlib_c_only.spec +gccnewlib_c_only.spec.in diff --git a/scripts/gccnewlib/Makefile.am b/scripts/gccnewlib/Makefile.am index 659f284c81..267c0b68a3 100644 --- a/scripts/gccnewlib/Makefile.am +++ b/scripts/gccnewlib/Makefile.am @@ -2,17 +2,33 @@ ## $Id$ ## -AUTOMAKE_OPTIONS = foreign +AUTOMAKE_OPTIONS = foreign 1.4 MKGCCNEWLIBSPEC = $(SHELL) $(top_builddir)/mkgccnewlibspec +SUBPACKAGES = gccnewlib.add \ + base-gcc.add target-gcc.add \ + base-chill.add target-chill.add \ + base-g77.add target-g77.add \ + base-gcj.add target-gcj.add \ + target-objc.add + +gccnewlib.spec.in: $(SUBPACKAGES) + cat $^ \ + | sed -e 's%@GCCLANGS@%%g' > $@ +CLEANFILES += gccnewlib.spec.in + +gccnewlib_c_only.spec.in: gccnewlib.add base-gcc.add target-gcc.add + cat $^ \ + | sed -e "s%@GCCLANGS@%\'--enable-languages=c,c++\'%g" > $@ +CLEANFILES += gccnewlib_c_only.spec.in + C_ONLY_ARG = -a $(top_builddir)/gccnewlib/gccnewlib_c_only.spec.in -MKGCCNEWLIBSPEC_DEPS = \ - $(top_builddir)/mkgccnewlibspec gccnewlib.spec.in $(top_builddir)/setup.cache -MKGCCNEWLIB_C_ONLY_SPEC_DEPS = \ - $(top_builddir)/mkgccnewlibspec gccnewlib_c_only.spec.in \ - $(top_builddir)/setup.cache +MKGCCNEWLIBSPEC_DEPS = $(top_builddir)/mkgccnewlibspec gccnewlib.spec.in \ + $(top_builddir)/setup.cache +MKGCCNEWLIB_C_ONLY_SPEC_DEPS = $(top_builddir)/mkgccnewlibspec \ + gccnewlib_c_only.spec.in $(top_builddir)/setup.cache hppa1.1-rtems-$(GCCNEWLIBVERS).spec: $(MKGCCNEWLIBSPEC_DEPS) $(MKGCCNEWLIBSPEC) -cfg $(top_builddir)/setup.cache -o . hppa1.1-rtems @@ -44,26 +60,14 @@ sh-rtemself-$(GCCNEWLIBVERS).spec: $(MKGCCNEWLIBSPEC_DEPS) sparc-rtems-$(GCCNEWLIBVERS).spec: $(MKGCCNEWLIBSPEC_DEPS) $(MKGCCNEWLIBSPEC) -cfg $(top_builddir)/setup.cache -o . sparc-rtems -TEMPLATES = \ -gccnewlib.spec.in \ -gccnewlib_c_only.spec.in - -RPM_SPECS_DATA = \ -hppa1.1-rtems-$(GCCNEWLIBVERS).spec \ -i386-rtems-$(GCCNEWLIBVERS).spec \ -i960-rtems-$(GCCNEWLIBVERS).spec \ -m68k-rtems-$(GCCNEWLIBVERS).spec \ -m68k-rtemself-$(GCCNEWLIBVERS).spec \ -mips64orion-rtems-$(GCCNEWLIBVERS).spec \ -powerpc-rtems-$(GCCNEWLIBVERS).spec \ -sh-rtems-$(GCCNEWLIBVERS).spec \ -sh-rtemself-$(GCCNEWLIBVERS).spec \ -sparc-rtems-$(GCCNEWLIBVERS).spec - -noinst_DATA = \ -$(TEMPLATES) - -EXTRA_DIST = \ -$(TEMPLATES) - -CLEANFILES = $(RPM_SPECS_DATA) +RPM_SPECS_DATA = hppa1.1-rtems-$(GCCNEWLIBVERS).spec \ + i386-rtems-$(GCCNEWLIBVERS).spec i960-rtems-$(GCCNEWLIBVERS).spec \ + m68k-rtems-$(GCCNEWLIBVERS).spec m68k-rtemself-$(GCCNEWLIBVERS).spec \ + mips64orion-rtems-$(GCCNEWLIBVERS).spec \ + powerpc-rtems-$(GCCNEWLIBVERS).spec sh-rtems-$(GCCNEWLIBVERS).spec \ + sh-rtemself-$(GCCNEWLIBVERS).spec sparc-rtems-$(GCCNEWLIBVERS).spec +CLEANFILES += $(RPM_SPECS_DATA) + +EXTRA_DIST = $(SUBPACKAGES) + +include $(top_srcdir)/../automake/local.am diff --git a/scripts/gccnewlib/README b/scripts/gccnewlib/README new file mode 100644 index 0000000000..db158b93c2 --- /dev/null +++ b/scripts/gccnewlib/README @@ -0,0 +1,8 @@ +# +# $Id$ +# + +This directory contains RPM-spec file fragments (*.add) which are used to +compose the toolchain specs. + +Cf. Makefile.am for details on how the toolchain specs get composed. diff --git a/scripts/gccnewlib/base-chill.add b/scripts/gccnewlib/base-chill.add index e69de29bb2..026d707be8 100644 --- a/scripts/gccnewlib/base-chill.add +++ b/scripts/gccnewlib/base-chill.add @@ -0,0 +1,38 @@ +# ============================================================== +# rtems-base-chill +# ============================================================== +%package -n rtems-base-chill +Provides: rtems-base-chill +Summary: base package for rtems gcc/chill compiler. +Group: rtems +Requires: rtems-base-gcc + +%description -n rtems-base-chill +RTEMS is an open source operating system for embedded systems. + +This is the files for gcc/chill that are shared by all targets. + +%files -n rtems-base-chill +%dir /opt/rtems/info +%doc /opt/rtems/info/chill.info*.gz + +%post -n rtems-base-chill + if test -d $RPM_INSTALL_PREFIX/rtems/info; + then + rm -f $RPM_INSTALL_PREFIX/rtems/info/dir + f=`find $RPM_INSTALL_PREFIX/rtems/info -name '*.info.gz'` + test -n "$f" && for i in $f; do + install-info $i $RPM_INSTALL_PREFIX/rtems/info/dir + done + fi + +%postun -n rtems-base-chill + if test -d $RPM_INSTALL_PREFIX/rtems/info; + then + rm -f $RPM_INSTALL_PREFIX/rtems/info/dir + f=`find $RPM_INSTALL_PREFIX/rtems/info -name '*.info.gz'` + test -n "$f" && for i in $f; do + install-info $i $RPM_INSTALL_PREFIX/rtems/info/dir + done + fi + diff --git a/scripts/gccnewlib/base-g77.add b/scripts/gccnewlib/base-g77.add index e69de29bb2..fbc8d87c07 100644 --- a/scripts/gccnewlib/base-g77.add +++ b/scripts/gccnewlib/base-g77.add @@ -0,0 +1,42 @@ +# ============================================================== +# rtems-base-g77 +# ============================================================== +%package -n rtems-base-g77 +Provides: rtems-base-g77 +Summary: rtems base package for gcc/g77 compiler +Group: rtems +Requires: rtems-base-gcc + +%description -n rtems-base-g77 +RTEMS is an open source operating system for embedded systems. + +This is the files for gcc/g77 that are shared by all targets. + +%files -n rtems-base-g77 +%dir /opt/rtems/info +%doc /opt/rtems/info/g77.info*.gz + +%dir /opt/rtems/man +%dir /opt/rtems/man/man1 +%doc /opt/rtems/man/man1/@target_alias@-g77.1 + +%post -n rtems-base-g77 + if test -d $RPM_INSTALL_PREFIX/rtems/info; + then + rm -f $RPM_INSTALL_PREFIX/rtems/info/dir + f=`find $RPM_INSTALL_PREFIX/rtems/info -name '*.info.gz'` + test -n "$f" && for i in $f; do + install-info $i $RPM_INSTALL_PREFIX/rtems/info/dir + done + fi + +%postun -n rtems-base-g77 + if test -d $RPM_INSTALL_PREFIX/rtems/info; + then + rm -f $RPM_INSTALL_PREFIX/rtems/info/dir + f=`find $RPM_INSTALL_PREFIX/rtems/info -name '*.info.gz'` + test -n "$f" && for i in $f; do + install-info $i $RPM_INSTALL_PREFIX/rtems/info/dir + done + fi + diff --git a/scripts/gccnewlib/base-gcc.add b/scripts/gccnewlib/base-gcc.add index e69de29bb2..d6a4b65cb3 100644 --- a/scripts/gccnewlib/base-gcc.add +++ b/scripts/gccnewlib/base-gcc.add @@ -0,0 +1,52 @@ +# ============================================================== +# rtems-base-gcc +# ============================================================== +%package -n rtems-base-gcc +Provides: rtems-base-gcc +Summary: base package for rtems gcc and newlib C Library +Group: rtems + +%description -n rtems-base-gcc + +RTEMS is an open source operating system for embedded systems. + +This is the files for gcc and newlib that are shared by all targets. + +%files -n rtems-base-gcc +%dir /opt/rtems/info +%doc /opt/rtems/info/cpp.info*.gz +%doc /opt/rtems/info/gcc.info*.gz +%doc /opt/rtems/info/libc.info*.gz +%doc /opt/rtems/info/libm.info*.gz + +%dir /opt/rtems/bin +/opt/rtems/bin/cpp@exe_ext@ +/opt/rtems/bin/gcov@exe_ext@ + +%dir /opt/rtems/man +%dir /opt/rtems/man/man1 +%doc /opt/rtems/man/man1/cccp.1 + +%dir /opt/rtems/include +/opt/rtems/include/g++-3 + +%post -n rtems-base-gcc + if test -d $RPM_INSTALL_PREFIX/rtems/info; + then + rm -f $RPM_INSTALL_PREFIX/rtems/info/dir + f=`find $RPM_INSTALL_PREFIX/rtems/info -name '*.info.gz'` + test -n "$f" && for i in $f; do + install-info $i $RPM_INSTALL_PREFIX/rtems/info/dir + done + fi + +%postun -n rtems-base-gcc + if test -d $RPM_INSTALL_PREFIX/rtems/info; + then + rm -f $RPM_INSTALL_PREFIX/rtems/info/dir + f=`find $RPM_INSTALL_PREFIX/rtems/info -name '*.info.gz'` + test -n "$f" && for i in $f; do + install-info $i $RPM_INSTALL_PREFIX/rtems/info/dir + done + fi + diff --git a/scripts/gccnewlib/base-gcj.add b/scripts/gccnewlib/base-gcj.add index e69de29bb2..e05cacab97 100644 --- a/scripts/gccnewlib/base-gcj.add +++ b/scripts/gccnewlib/base-gcj.add @@ -0,0 +1,20 @@ +# ============================================================== +# rtems-base-gcj +# ============================================================== +%package -n rtems-base-gcj +Provides: rtems-base-gcj +Summary: base package for rtems gcc/java compiler (gcj). +Group: rtems +Requires: rtems-base-gcc + +%description -n rtems-base-gcj +RTEMS is an open source operating system for embedded systems. + +This is the files for gcc/java (gcj) that are shared by all targets. + +%files -n rtems-base-gcj +%dir /opt/rtems/bin +/opt/rtems/bin/jcf-dump@exe_ext@ +/opt/rtems/bin/jv-scan@exe_ext@ +/opt/rtems/bin/gcjh@exe_ext@ + diff --git a/scripts/gccnewlib/gccnewlib.add b/scripts/gccnewlib/gccnewlib.add index e69de29bb2..c547660055 100644 --- a/scripts/gccnewlib/gccnewlib.add +++ b/scripts/gccnewlib/gccnewlib.add @@ -0,0 +1,138 @@ +# +# spec file for building gcc for rtems +# +# Copyright (c) 1999,2000 OARCorp, Huntsville, AL +# +# please send bugfixes or comments to joel@OARcorp.com +# + +Vendor: OAR Corporation +Distribution: Linux +Name: @target_alias@-gcc-newlib +Summary: gcc and newlib C Library for @target_alias@. +Group: rtems +Release: @Release@ +License: gcc is GPL/LGPL ; newlib no has restrictions on run-time usage + +Autoreqprov: on +Packager: corsepiu@faw.uni-ulm.de and joel@OARcorp.com + +Version: gcc@gcc_version@newlib@newlib_version@ +Source0: ftp://ftp.gnu.org/pub/gnu/gcc/gcc-@gcc_version@.tar.gz +Source1: ftp://sourceware.cygnus/com/pub/newlib/newlib-@newlib_version@.tar.gz +Patch0: gcc-@gcc_version@-rtems-@gcc_patch_version@.diff +Patch1: newlib-@newlib_version@-rtems-@newlib_patch_version@.diff +Buildroot: /tmp/@target_alias@-gcc-newlib + +# +# The original sources are not included in the source RPM. +# If we included them, then the source RPMs for each target +# would duplicate MBs of source unnecessarily. This is +# a duplication of over 30 MBs of source for each of +# the more than 10 targets it is possible to build. +# +# You can get them yourself from the Internet and copy them to +# your /usr/src/redhat/SOURCES directory ($RPM_SOURCE_DIR). +# Or you can try the ftp options of rpm :-) +# +NoSource: 0 +NoSource: 1 + +%description +RTEMS is an open source operating system for embedded systems. + +This is gcc's and newlib C Library's sources with patches for RTEMS. + + The original sources are not included in the source RPM. + If we included them, then the source RPMs for each target + would duplicate MBs of source unnecessarily. This is + a duplication of over 30 MBs of source for each of + the more than 10 targets it is possible to build. + + You can get them yourself from the Internet and copy them to + your /usr/src/[redhat|packages]/SOURCES directory ($RPM_SOURCE_DIR). + Or you can try the ftp options of rpm :-) + +%prep +# untar the sources inside @target_alias@-gcc-newlib +%setup -c -n @target_alias@-gcc-newlib -a 0 -a 1 + +%patch0 -p0 +%patch1 -p0 + + # Copy the C library into gcc's source tree + ln -s ../newlib-@newlib_version@/newlib gcc-@gcc_version@ + test -d build || mkdir build + +%build + cd build + + ../gcc-@gcc_version@/configure --target=@target_alias@ \ + --with-gnu-as --with-gnu-ld --with-newlib --verbose \ + --enable-threads --prefix=/opt/rtems @GCCLANGS@ + + make all + make info + +%install + cd build + # Bug in gcc-2.95.1: It doesn't build this installation directory + # If it doesn't find it, gcc doesn't install @target_alias@/bin/gcc + ../gcc-@gcc_version@/mkinstalldirs \ + $RPM_BUILD_ROOT/opt/rtems/@target_alias@/bin + + make prefix=$RPM_BUILD_ROOT/opt/rtems install + cd @target_alias@/newlib + make prefix=$RPM_BUILD_ROOT/opt/rtems install-info + + # cd back to build/ + cd ../.. + + # gzip info files + gzip -f $RPM_BUILD_ROOT/opt/rtems/info/*.info 2>/dev/null + gzip -f $RPM_BUILD_ROOT/opt/rtems/info/*.info-? 2>/dev/null + gzip -f $RPM_BUILD_ROOT/opt/rtems/info/*.info-?? 2>/dev/null + + rm -f dirs ; + echo "%dir /opt/rtems/lib" >> dirs ; + echo "%dir /opt/rtems/lib/gcc-lib" >> dirs ; + echo "%dir /opt/rtems/lib/gcc-lib/@target_alias@" >> dirs ; + + # Collect multilib subdirectories + TGTDIR="/opt/rtems/lib/gcc-lib/@target_alias@/@gcc_version@" + f=`gcc/xgcc --print-multi-lib | sed -e 's,;.*$,,'` + for i in $f; do + case $i in + \.) echo "%dir ${TGTDIR}" >> dirs + ;; + *) echo "%dir ${TGTDIR}/$i" >> dirs + ;; + esac + done + + # Collect files to go into different packages + cp dirs files.chill + cp dirs files.gcc + cp dirs files.g77 + cp dirs files.objc + cp dirs files.gcj + + f=`find ${RPM_BUILD_ROOT}${TGTDIR} ! -type d -print | sed -e "s,^$RPM_BUILD_ROOT,,g"`; + for i in $f; do + case $i in + *chill*) echo "$i" >> files.chill ;; + *f771) ;; + *cc1obj) ;; + *libobjc*) echo "$i" >> files.objc ;; + *include/objc*) ;; + *jc1) ;; + *jvgenmain) ;; + *) echo "$i" >> files.gcc ;; + esac + done + +%clean +# let rpm --clean remove BuildRoot iif using the default BuildRoot + test "$RPM_BUILD_ROOT" = "/tmp/@target_alias@-gcc-newlib" && \ + rm -rf $RPM_BUILD_ROOT + diff --git a/scripts/gccnewlib/target-chill.add b/scripts/gccnewlib/target-chill.add index e69de29bb2..5e10a84814 100644 --- a/scripts/gccnewlib/target-chill.add +++ b/scripts/gccnewlib/target-chill.add @@ -0,0 +1,18 @@ +# ============================================================== +# @target_alias@-chill +# ============================================================== +%package -n @target_alias@-chill +Provides: @target_alias@-chill +Summary: gcc/chill compiler for @target_alias@ +Group: rtems +Requires: rtems-base-chill @target_alias@-gcc + +%description -n @target_alias@-chill +RTEMS is an open source operating system for embedded systems. + +This is the gcc/chill compiler and support files for @target_alias@ + +%files -n @target_alias@-chill -f build/files.chill +%dir /opt/rtems/bin +/opt/rtems/bin/@target_alias@-chill + diff --git a/scripts/gccnewlib/target-g77.add b/scripts/gccnewlib/target-g77.add index e69de29bb2..920a709652 100644 --- a/scripts/gccnewlib/target-g77.add +++ b/scripts/gccnewlib/target-g77.add @@ -0,0 +1,19 @@ +# ============================================================== +# @target_alias@-g77 +# ============================================================== +%package -n @target_alias@-g77 +Provides: @target_alias@-g77 +Summary: gcc/g77 compiler for @target_alias@ +Group: rtems +Requires: rtems-base-g77 @target_alias@-gcc + +%description -n @target_alias@-g77 +RTEMS is an open source operating system for embedded systems. + +This is the gcc/g77 compiler for @target_alias@ + +%files -n @target_alias@-g77 -f build/files.g77 +%dir /opt/rtems/bin +/opt/rtems/bin/@target_alias@-g77@exe_ext@ + +/opt/rtems/lib/gcc-lib/@target_alias@/@gcc_version@/f771@exe_ext@ diff --git a/scripts/gccnewlib/target-gcc.add b/scripts/gccnewlib/target-gcc.add index e69de29bb2..3f78469362 100644 --- a/scripts/gccnewlib/target-gcc.add +++ b/scripts/gccnewlib/target-gcc.add @@ -0,0 +1,28 @@ +# ============================================================== +# @target_alias@-gcc +# ============================================================== +%package -n @target_alias@-gcc +Provides: @target_alias@-gcc +Summary: rtems gcc and newlib C Library for @target_alias@ +Group: rtems +Requires: @target_alias@-binutils rtems-base-gcc + +%description -n @target_alias@-gcc +RTEMS is an open source operating system for embedded systems. + +This is gcc and newlib C Library for @target_alias@. + +%files -n @target_alias@-gcc -f build/files.gcc +%doc /opt/rtems/man/man1/@target_alias@-gcc.1 +%doc /opt/rtems/man/man1/@target_alias@-g++.1 + +/opt/rtems/bin/@target_alias@-c++@exe_ext@ +/opt/rtems/bin/@target_alias@-g++@exe_ext@ +/opt/rtems/bin/@target_alias@-gcc@exe_ext@ +/opt/rtems/bin/@target_alias@-protoize@exe_ext@ +/opt/rtems/bin/@target_alias@-unprotoize@exe_ext@ + +%dir /opt/rtems/lib/gcc-lib/@target_alias@/@gcc_version@/include + +/opt/rtems/@target_alias@ + diff --git a/scripts/gccnewlib/target-gcj.add b/scripts/gccnewlib/target-gcj.add index e69de29bb2..85ae067e5f 100644 --- a/scripts/gccnewlib/target-gcj.add +++ b/scripts/gccnewlib/target-gcj.add @@ -0,0 +1,21 @@ +# ============================================================== +# @target_alias@-gcj +# ============================================================== +%package -n @target_alias@-gcj +Provides: @target_alias@-gcj +Summary: gcc/java compiler (gcj) for @target_alias@ +Group: rtems +Requires: rtems-base-gcj @target_alias@-gcc + +%description -n @target_alias@-gcj +RTEMS is an open source operating system for embedded systems. + +This is the gcc/java compiler for @target_alias@ + +%files -n @target_alias@-gcj -f build/files.gcj +%dir /opt/rtems/bin +/opt/rtems/bin/@target_alias@-gcj@exe_ext@ + +/opt/rtems/lib/gcc-lib/@target_alias@/@gcc_version@/jc1@exe_ext@ +/opt/rtems/lib/gcc-lib/@target_alias@/@gcc_version@/jvgenmain@exe_ext@ + diff --git a/scripts/gccnewlib/target-objc.add b/scripts/gccnewlib/target-objc.add index e69de29bb2..0183ad29f9 100644 --- a/scripts/gccnewlib/target-objc.add +++ b/scripts/gccnewlib/target-objc.add @@ -0,0 +1,17 @@ +# ============================================================== +# @target_alias@-objc +# ============================================================== +%package -n @target_alias@-objc +Provides: @target_alias@-objc +Summary: gcc/objc compiler for @target_alias@ +Group: rtems +Requires: @target_alias@-gcc + +%description -n @target_alias@-objc +RTEMS is an open source operating system for embedded systems. + +This is the gcc/objc compiler for @target_alias@ + +%files -n @target_alias@-objc -f build/files.objc +/opt/rtems/lib/gcc-lib/@target_alias@/@gcc_version@/cc1obj@exe_ext@ +/opt/rtems/lib/gcc-lib/@target_alias@/@gcc_version@/include/objc -- cgit v1.2.3