diff options
author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2003-04-18 12:58:24 +0000 |
---|---|---|
committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2003-04-18 12:58:24 +0000 |
commit | 217019f3b6605a28ecf264a924fc77c6f3fcecb2 (patch) | |
tree | 257c10a5ab09859b7aade9108d35daf640151492 /scripts | |
parent | 2003-04-17 Joel Sherrill <joel@OARcorp.com> (diff) | |
download | rtems-217019f3b6605a28ecf264a924fc77c6f3fcecb2.tar.bz2 |
2003-04-18 Joel Sherrill <joel@OARcorp.com>
* ChangeLog, gcc3newlib/gccnewlib.add, gdb/Makefile.am: Merged from
head.
Diffstat (limited to 'scripts')
-rw-r--r-- | scripts/ChangeLog | 10 | ||||
-rw-r--r-- | scripts/gcc3newlib/gccnewlib.add | 7 | ||||
-rw-r--r-- | scripts/gdb/Makefile.am | 48 |
3 files changed, 44 insertions, 21 deletions
diff --git a/scripts/ChangeLog b/scripts/ChangeLog index 4a4fc1377a..5e7640af57 100644 --- a/scripts/ChangeLog +++ b/scripts/ChangeLog @@ -1,3 +1,13 @@ +2003-04-18 Joel Sherrill <joel@OARcorp.com> + + * ChangeLog, gcc3newlib/gccnewlib.add, gdb/Makefile.am: Merged from + head. + +2003-04-18 Joel Sherrill <joel@OARcorp.com> + + * setup.def: Update to gcc3.2.2newlib1.11.0-2. + * gcc3newlib/gccnewlib.add: We used .bz2 files. + 2003-02-26 Ralf Corsepius <corsepiu@faw.uni-ulm.de> * gcc3newlib/gccnewlib.add: Add %gcc_version, %newlib_version. diff --git a/scripts/gcc3newlib/gccnewlib.add b/scripts/gcc3newlib/gccnewlib.add index 79154fdd8c..18426b3e81 100644 --- a/scripts/gcc3newlib/gccnewlib.add +++ b/scripts/gcc3newlib/gccnewlib.add @@ -13,8 +13,8 @@ Packager: corsepiu@faw.uni-ulm.de and joel@OARcorp.com Version: gcc%{gcc_version}newlib%{newlib_version} # gcc 3.x and gcc 2.9 -Source0: ftp://ftp.gnu.org/pub/gnu/gcc/gcc-%{gcc_version}.tar.gz -# Source0: ftp://ftp.gnu.org/pub/gnu/gcc/gcc-%{gcc_version}.tar.bz2 +# Source0: ftp://ftp.gnu.org/pub/gnu/gcc/gcc-@gcc_version@.tar.gz +Source0: ftp://ftp.gnu.org/pub/gnu/gcc/gcc-@gcc_version@.tar.bz2 # gcc 2.95.x # Source0: ftp://ftp.gnu.org/pub/gnu/gcc/gcc-%{gcc_version}.tar.bz2 Source1: ftp://sources.redhat.com/pub/newlib/newlib-%{newlib_version}.tar.gz @@ -112,7 +112,8 @@ BuildPreReq: zlib-devel %if %build_gnat # Building gnat requires gnat %if "%_vendor" == "redhat" -BuildPreReq: gcc-gnat +# This really isn't available until RedHat 8.0. How to conditionalize this? +# BuildPreReq: gcc-gnat %endif %endif diff --git a/scripts/gdb/Makefile.am b/scripts/gdb/Makefile.am index a33bb87361..fd29ad67cc 100644 --- a/scripts/gdb/Makefile.am +++ b/scripts/gdb/Makefile.am @@ -19,63 +19,75 @@ CLEANFILES = gdb.spec.in MKGDBSPEC_DEPS = mkspec gdb.spec.in \ $(top_builddir)/setup.cache +RPM_SPECS_DATA = + arm-rtems-$(GDBVERS).spec: $(MKGDBSPEC_DEPS) $(MKSPEC) -cfg $(top_builddir)/setup.cache arm-rtems > $@ +RPM_SPECS_DATA += arm-rtems-$(GDBVERS).spec -c4x-rtems-$(GDBVERS).spec: $(MKGDBSPEC_DEPS) - $(MKSPEC) -cfg $(top_builddir)/setup.cache c4x-rtems > $@ +# does not build with 5.2 +# c4x-rtems-$(GDBVERS).spec: $(MKGDBSPEC_DEPS) +# $(MKSPEC) -cfg $(top_builddir)/setup.cache c4x-rtems > $@ +# RPM_SPECS_DATA += c4x-rtems-$(GDBVERS).spec h8300-rtems-$(GDBVERS).spec: $(MKGDBSPEC_DEPS) $(MKSPEC) -cfg $(top_builddir)/setup.cache h8300-rtems > $@ +RPM_SPECS_DATA += h8300-rtems-$(GDBVERS).spec -hppa1.1-rtems-$(GDBVERS).spec: $(MKGDBSPEC_DEPS) - $(MKSPEC) -cfg $(top_builddir)/setup.cache hppa1.1-rtems > $@ +# does not build with 5.2 +# hppa1.1-rtems-$(GDBVERS).spec: $(MKGDBSPEC_DEPS) +# $(MKSPEC) -cfg $(top_builddir)/setup.cache hppa1.1-rtems > $@ +# RPM_SPECS_DATA += hppa1.1-rtems-$(GDBVERS).spec +RPM_SPECS_DATA += i386-rtems-$(GDBVERS).spec i386-rtems-$(GDBVERS).spec: $(MKGDBSPEC_DEPS) $(MKSPEC) -cfg $(top_builddir)/setup.cache i386-rtems > $@ -i386-RTEMS-$(GDBVERS).spec: $(MKGDBSPEC_DEPS) - $(MKSPEC) -cfg $(top_builddir)/setup.cache i386-RTEMS > $@ +# does not build with 5.2 +# i386-RTEMS-$(GDBVERS).spec: $(MKGDBSPEC_DEPS) +# $(MKSPEC) -cfg $(top_builddir)/setup.cache i386-RTEMS > $@ +# RPM_SPECS_DATA += i386-RTEMS-$(GDBVERS).spec i960-rtems-$(GDBVERS).spec: $(MKGDBSPEC_DEPS) $(MKSPEC) -cfg $(top_builddir)/setup.cache i960-rtems > $@ +RPM_SPECS_DATA += i960-rtems-$(GDBVERS).spec m68k-rtems-$(GDBVERS).spec: $(MKGDBSPEC_DEPS) $(MKSPEC) -cfg $(top_builddir)/setup.cache m68k-rtems > $@ +RPM_SPECS_DATA += m68k-rtems-$(GDBVERS).spec mips64orion-rtems-$(GDBVERS).spec: $(MKGDBSPEC_DEPS) $(MKSPEC) -cfg $(top_builddir)/setup.cache mips64orion-rtems > $@ +RPM_SPECS_DATA += mips64orion-rtems-$(GDBVERS).spec mips-rtems-$(GDBVERS).spec: $(MKGDBSPEC_DEPS) $(MKSPEC) -cfg $(top_builddir)/setup.cache mips-rtems > $@ +RPM_SPECS_DATA += mips-rtems-$(GDBVERS).spec mipstx39-rtems-$(GDBVERS).spec: $(MKGDBSPEC_DEPS) $(MKSPEC) -cfg $(top_builddir)/setup.cache mipstx39-rtems > $@ +RPM_SPECS_DATA += mipstx39-rtems-$(GDBVERS).spec -powerpc-RTEMS-$(GDBVERS).spec: $(MKGDBSPEC_DEPS) - $(MKSPEC) -cfg $(top_builddir)/setup.cache powerpc-RTEMS > $@ +# does not build with 5.2 +# powerpc-RTEMS-$(GDBVERS).spec: $(MKGDBSPEC_DEPS) +# $(MKSPEC) -cfg $(top_builddir)/setup.cache powerpc-RTEMS > $@ +# RPM_SPECS_DATA += powerpc-RTEMS-$(GDBVERS).spec powerpc-rtems-$(GDBVERS).spec: $(MKGDBSPEC_DEPS) $(MKSPEC) -cfg $(top_builddir)/setup.cache powerpc-rtems > $@ +RPM_SPECS_DATA += powerpc-rtems-$(GDBVERS).spec sh-rtems-$(GDBVERS).spec: $(MKGDBSPEC_DEPS) $(MKSPEC) -cfg $(top_builddir)/setup.cache sh-rtems > $@ +RPM_SPECS_DATA += sh-rtems-$(GDBVERS).spec sh-rtemself-$(GDBVERS).spec: $(MKGDBSPEC_DEPS) $(MKSPEC) -cfg $(top_builddir)/setup.cache sh-rtemself > $@ +RPM_SPECS_DATA += sh-rtemself-$(GDBVERS).spec sparc-rtems-$(GDBVERS).spec: $(MKGDBSPEC_DEPS) $(MKSPEC) -cfg $(top_builddir)/setup.cache sparc-rtems > $@ - -RPM_SPECS_DATA = \ - arm-rtems-$(GDBVERS).spec c4x-rtems-$(GDBVERS).spec \ - h8300-rtems-$(GDBVERS).spec hppa1.1-rtems-$(GDBVERS).spec \ - i386-rtems-$(GDBVERS).spec i960-rtems-$(GDBVERS).spec \ - m68k-rtems-$(GDBVERS).spec mips-rtems-$(GDBVERS).spec \ - mipstx39-rtems-$(GDBVERS).spec mips64orion-rtems-$(GDBVERS).spec \ - powerpc-rtems-$(GDBVERS).spec sh-rtems-$(GDBVERS).spec \ - sh-rtemself-$(GDBVERS).spec sparc-rtems-$(GDBVERS).spec \ - i386-RTEMS-$(GDBVERS).spec powerpc-RTEMS-$(GDBVERS).spec +RPM_SPECS_DATA += sparc-rtems-$(GDBVERS).spec CLEANFILES += $(RPM_SPECS_DATA) |