diff options
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/Makefile.am | 1 | ||||
| -rw-r--r-- | scripts/gccnewlib/Makefile.am | 7 | ||||
| -rw-r--r-- | scripts/gnatnewlib/gnatnewlib.spec.in | 50 | ||||
| -rw-r--r-- | scripts/mkgccnewlibspec.in | 8 |
4 files changed, 19 insertions, 47 deletions
diff --git a/scripts/Makefile.am b/scripts/Makefile.am index d75c44fb3a..fcb851094a 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -1,5 +1,6 @@ AUTOMAKE_OPTIONS = foreign +# add gnatnewlib once that one works. :) SUBDIRS = . binutils gccnewlib gdb rtems noinst_SCRIPTS = \ diff --git a/scripts/gccnewlib/Makefile.am b/scripts/gccnewlib/Makefile.am index 099ee80b17..b56767434f 100644 --- a/scripts/gccnewlib/Makefile.am +++ b/scripts/gccnewlib/Makefile.am @@ -4,6 +4,8 @@ AUTOMAKE_OPTIONS = foreign MKGCCNEWLIBSPEC = $(SHELL) $(top_builddir)/mkgccnewlibspec +C_ONLY_ARG = -a $(top_builddir)/gccnewlib/gccnewlib_c_only.spec.in + MKGCCNEWLIBSPEC_DEPS = \ $(top_builddir)/mkgccnewlibspec gccnewlib.spec.in $(top_builddir)/setup.cache @@ -14,7 +16,7 @@ i386-rtems-$(GCCNEWLIBVERS).spec: $(MKGCCNEWLIBSPEC_DEPS) $(MKGCCNEWLIBSPEC) -cfg $(top_builddir)/setup.cache -o . i386-rtems i960-rtems-$(GCCNEWLIBVERS).spec: $(MKGCCNEWLIBSPEC_DEPS) - $(MKGCCNEWLIBSPEC) -cfg $(top_builddir)/setup.cache -o . i960-rtems + $(MKGCCNEWLIBSPEC) $(C_ONLY_ARG) -cfg $(top_builddir)/setup.cache -o . i960-rtems m68k-rtems-$(GCCNEWLIBVERS).spec: $(MKGCCNEWLIBSPEC_DEPS) $(MKGCCNEWLIBSPEC) -cfg $(top_builddir)/setup.cache -o . m68k-rtems @@ -38,7 +40,8 @@ sparc-rtems-$(GCCNEWLIBVERS).spec: $(MKGCCNEWLIBSPEC_DEPS) $(MKGCCNEWLIBSPEC) -cfg $(top_builddir)/setup.cache -o . sparc-rtems TEMPLATES = \ -gccnewlib.spec.in +gccnewlib.spec.in \ +gccnewlib_c_only.spec.in RPM_SPECS_DATA = \ hppa1.1-rtems-$(GCCNEWLIBVERS).spec \ diff --git a/scripts/gnatnewlib/gnatnewlib.spec.in b/scripts/gnatnewlib/gnatnewlib.spec.in index 2a8fa1ef3b..7b91a4722b 100644 --- a/scripts/gnatnewlib/gnatnewlib.spec.in +++ b/scripts/gnatnewlib/gnatnewlib.spec.in @@ -9,22 +9,22 @@ Vendor: OAR Corporation Distribution: Linux Name: @target_alias@-gcc-newlib -Summary: gcc and newlib C Library for @target_alias@. +Summary: gnat, gcc, and newlib C Library for @target_alias@. Group: rtems Release: @Release@ Copyright: 1999 OARCorp -Provides: @target_alias@-gcc @target_alias@-chill @target_alias@-gcj -Provides: @target_alias@-g77 @target_alias@-objc +Provides: @target_alias@-gcc Requires: @target_alias@-binutils Autoreqprov: on Packager: corsepiu@faw.uni-ulm.de and joel@OARcorp.com -Version: gcc@gcc_version@newlib@newlib_version@ +Version: gnat@gnat_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 +Source2: ftp://cs.nyu.edu/pub/gnat/gnat-@gnat_version@.tar.gz +Patch0: gcc-@gcc_version@-gnatrtems-@gcc_patch_version@.diff Patch1: newlib-@newlib_version@-rtems-@newlib_patch_version@.diff Buildroot: /tmp @@ -39,7 +39,7 @@ Buildroot: /tmp # your /usr/src/redhat/SOURCES directory ($RPM_SOURCE_DIR). # Or you can try the ftp options of rpm :-) # -NoSource: 0, 1 +NoSource: 0, 1, 2 %description RTEMS is an open source operating system for embedded systems. @@ -56,44 +56,6 @@ This is gcc's and newlib C Library's sources with patches for RTEMS. your /usr/src/redhat/SOURCES directory ($RPM_SOURCE_DIR). Or you can try the ftp options of rpm :-) -%package -n @target_alias@-gcc -Summary: rtems gcc and newlib C Library for @target_alias@ -Group: rtems -Requires: @target_alias@-binutils - -%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 diff --git a/scripts/mkgccnewlibspec.in b/scripts/mkgccnewlibspec.in index c27279c368..054cdeac1f 100644 --- a/scripts/mkgccnewlibspec.in +++ b/scripts/mkgccnewlibspec.in @@ -17,6 +17,8 @@ usage() exit 1 ; } +specsrc=${RTEMS_DIR}/gccnewlib/gccnewlib.spec.in + while test $# -ge 2; do case $1 in -cfg) @@ -28,6 +30,10 @@ case $1 in shift dst=$1 shift +-a) # alternate specs file + shift + specsrc=$1 + shift ;; -*) echo "invalid option $1"; @@ -56,7 +62,7 @@ sed -e "s%@Release@%${gccnewlib_rpm_release}%g" \ -e "s%@gcc_patch_version@%${gcc_patch_version}%g" \ -e "s%@newlib_version@%${newlib_version}%g" \ -e "s%@newlib_patch_version@%${newlib_patch_version}%g" \ -< ${RTEMS_DIR}/gccnewlib/gccnewlib.spec.in \ +< ${specsrc} \ > ${specfile} echo Generated ${specfile}. |