From 4c46630639ab25de2a90507694d369116a26059b Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Mon, 31 Jan 2000 15:15:10 +0000 Subject: Patch rtems-rc-20000118-1.diff from Ralf Corsepius that contains: * cleanups to configuration files * A reworked gccnewlib.spec.in: I have reformated it for enhanced readability and added more rtems-base packages. It now should be free of any installation conflicts (If there still remain some, they should be regarded as bugs). * A fix to the bin2boot RTEMS_BSP issue (make RTEMS_BSP="pc386 pc486" now works). * removes libbsp/bare/wrapup * Further cleanups --- scripts/gccnewlib/Makefile.am | 2 + scripts/gccnewlib/gccnewlib.spec.in | 262 ++++++++++++++++++++++-------------- 2 files changed, 162 insertions(+), 102 deletions(-) (limited to 'scripts/gccnewlib') diff --git a/scripts/gccnewlib/Makefile.am b/scripts/gccnewlib/Makefile.am index 38102acae9..659f284c81 100644 --- a/scripts/gccnewlib/Makefile.am +++ b/scripts/gccnewlib/Makefile.am @@ -1,4 +1,6 @@ +## ## $Id$ +## AUTOMAKE_OPTIONS = foreign diff --git a/scripts/gccnewlib/gccnewlib.spec.in b/scripts/gccnewlib/gccnewlib.spec.in index cf95d060f5..bb2607eb44 100644 --- a/scripts/gccnewlib/gccnewlib.spec.in +++ b/scripts/gccnewlib/gccnewlib.spec.in @@ -1,7 +1,7 @@ # # spec file for building gcc for rtems # -# Copyright (c) 1999 OARCorp, Huntsville, AL +# Copyright (c) 1999,2000 OARCorp, Huntsville, AL # # please send bugfixes or comments to joel@OARcorp.com # @@ -14,8 +14,11 @@ Group: rtems Release: @Release@ Copyright: 1999 OARCorp -Provides: rtems-base-gcc @target_alias@-gcc @target_alias@-chill -Provides: @target_alias@-gcj @target_alias@-g77 @target_alias@-objc +Provides: rtems-base-gcc @target_alias@-gcc +Provides: rtems-base-chill @target_alias@-chill +Provides: rtems-base-gcj @target_alias@-gcj +Provides: rtems-base-g77 @target_alias@-g77 +Provides: @target_alias@-objc Requires: @target_alias@-binutils Autoreqprov: on @@ -53,69 +56,9 @@ This is gcc's and newlib C Library's sources with patches for RTEMS. 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). + your /usr/src/[redhat|packages]/SOURCES directory ($RPM_SOURCE_DIR). Or you can try the ftp options of rpm :-) -%package -n 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. - -%package -n @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@. - -%package -n @target_alias@-chill -Summary: gcc/chill compiler for @target_alias@ -Group: rtems -Requires: @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@ - -%package -n @target_alias@-gcj -Summary: gcc/java compiler (gcj) for @target_alias@ -Group: rtems -Requires: @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@ - -%package -n @target_alias@-g77 -Summary: gcc/g77 compiler for @target_alias@ -Group: rtems -Requires: @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@ - -%package -n @target_alias@-objc -Summary: gcc/objc compiler for @target_alias@ -Group: rtems -Requires: @target_alias@-objc - -%description -n @target_alias@-objc -RTEMS is an open source operating system for embedded systems. - -This is the gcc/objc compiler for @target_alias@ - %prep # untar the sources inside @target_alias@-gcc-newlib %setup -c -n @target_alias@-gcc-newlib -a 0 -a 1 @@ -198,13 +141,25 @@ This is the gcc/objc compiler for @target_alias@ esac done +# ============================================================== +# rtems-base-gcc +# ============================================================== +%package -n 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/dir -%doc /opt/rtems/info/cpp.info* -%doc /opt/rtems/info/gcc.info* -%doc /opt/rtems/info/libc.info* -%doc /opt/rtems/info/libm.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@ @@ -217,22 +172,7 @@ This is the gcc/objc compiler for @target_alias@ %dir /opt/rtems/include /opt/rtems/include/g++-3 -%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@ - -%post -n @target_alias@-gcc +%post -n rtems-base-gcc if test -d $RPM_INSTALL_PREFIX/rtems/info; then rm -f $RPM_INSTALL_PREFIX/rtems/info/dir @@ -242,7 +182,7 @@ This is the gcc/objc compiler for @target_alias@ done fi -%postun -n @target_alias@-gcc +%postun -n rtems-base-gcc if test -d $RPM_INSTALL_PREFIX/rtems/info; then rm -f $RPM_INSTALL_PREFIX/rtems/info/dir @@ -252,16 +192,51 @@ This is the gcc/objc compiler for @target_alias@ done fi +# ============================================================== +# @target_alias@-gcc +# ============================================================== +%package -n @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. -%files -n @target_alias@-chill -f build/files.chill -%dir /opt/rtems/bin -/opt/rtems/bin/@target_alias@-chill +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@ + +# ============================================================== +# rtems-base-chill +# ============================================================== +%package -n 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/dir -%doc /opt/rtems/info/chill.info* +%doc /opt/rtems/info/chill.info*.gz -%post -n @target_alias@-chill +%post -n rtems-base-chill if test -d $RPM_INSTALL_PREFIX/rtems/info; then rm -f $RPM_INSTALL_PREFIX/rtems/info/dir @@ -271,7 +246,7 @@ This is the gcc/objc compiler for @target_alias@ done fi -%postun -n @target_alias@-chill +%postun -n rtems-base-chill if test -d $RPM_INSTALL_PREFIX/rtems/info; then rm -f $RPM_INSTALL_PREFIX/rtems/info/dir @@ -281,32 +256,84 @@ This is the gcc/objc compiler for @target_alias@ done fi +# ============================================================== +# @target_alias@-chill +# ============================================================== +%package -n @target_alias@-chill +Summary: gcc/chill compiler for @target_alias@ +Group: rtems +Requires: rtems-base-chill @target_alias@-gcc -%files -n @target_alias@-gcj -f build/files.gcj +%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 + +# ============================================================== +# rtems-base-gcj +# ============================================================== +%package -n 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@ + +# ============================================================== +# @target_alias@-gcj +# ============================================================== +%package -n @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 /opt/rtems/lib/gcc-lib/@target_alias@/@gcc_version@/jvgenmain +# ============================================================== +# rtems-base-g77 +# ============================================================== +%package -n rtems-base-g77 +Summary: rtems base package for gcc/g77 compiler +Group: rtems +Requires: rtems-base-gcc -%files -n @target_alias@-g77 -f build/files.g77 -%dir /opt/rtems/bin -/opt/rtems/bin/@target_alias@-g77@exe_ext@ +%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* +%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 -/opt/rtems/lib/gcc-lib/@target_alias@/@gcc_version@/f771@exe_ext@ - -%post -n @target_alias@-g77 +%post -n rtems-base-g77 if test -d $RPM_INSTALL_PREFIX/rtems/info; then rm -f $RPM_INSTALL_PREFIX/rtems/info/dir @@ -316,7 +343,7 @@ This is the gcc/objc compiler for @target_alias@ done fi -%postun -n @target_alias@-g77 +%postun -n rtems-base-g77 if test -d $RPM_INSTALL_PREFIX/rtems/info; then rm -f $RPM_INSTALL_PREFIX/rtems/info/dir @@ -326,6 +353,37 @@ This is the gcc/objc compiler for @target_alias@ done fi +# ============================================================== +# @target_alias@-g77 +# ============================================================== +%package -n @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@ + +# ============================================================== +# @target_alias@-objc +# ============================================================== +%package -n @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@ -- cgit v1.2.3