summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2003-02-26 18:05:17 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2003-02-26 18:05:17 +0000
commita696c7ae9ee108cb05e27a0276fd642ab8f8baa2 (patch)
treed5f58c28f91019d2f2a2a986974b520db920864c
parent2003-02-20 Till Straumann <strauman@slac.stanford.edu> (diff)
downloadrtems-a696c7ae9ee108cb05e27a0276fd642ab8f8baa2.tar.bz2
2003-02-26 RTEMS
* setup.def: Updated gdb revision to -2 so arm will build and to fix psim build problem on NetBSD. * gcc3newlib/gccnewlib.add: Ignore dependency on GNAT RPM since RedHat 7.3 doesn't have it available. Maybe later. * gdb/Makefile.am: Cleanup way the RPM_SPECS_DATA variable is built.
-rw-r--r--scripts/ChangeLog8
-rw-r--r--scripts/gcc3newlib/gccnewlib.add3
-rw-r--r--scripts/gdb/Makefile.am48
-rw-r--r--scripts/setup.def8
4 files changed, 44 insertions, 23 deletions
diff --git a/scripts/ChangeLog b/scripts/ChangeLog
index f3a9218404..0aa0804d2d 100644
--- a/scripts/ChangeLog
+++ b/scripts/ChangeLog
@@ -1,3 +1,11 @@
+2003-02-26 RTEMS
+
+ * setup.def: Updated gdb revision to -2 so arm will build and
+ to fix psim build problem on NetBSD.
+ * gcc3newlib/gccnewlib.add: Ignore dependency on GNAT RPM since
+ RedHat 7.3 doesn't have it available. Maybe later.
+ * gdb/Makefile.am: Cleanup way the RPM_SPECS_DATA variable is built.
+
2003-02-11 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* configure.ac: AM_INIT_AUTOMAKE([1.7.2]).
diff --git a/scripts/gcc3newlib/gccnewlib.add b/scripts/gcc3newlib/gccnewlib.add
index f5f145c318..f52c59286d 100644
--- a/scripts/gcc3newlib/gccnewlib.add
+++ b/scripts/gcc3newlib/gccnewlib.add
@@ -108,7 +108,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)
diff --git a/scripts/setup.def b/scripts/setup.def
index e08e004ee7..918fc9e4de 100644
--- a/scripts/setup.def
+++ b/scripts/setup.def
@@ -12,13 +12,13 @@ gcc_version=2.95.3
gcc_patch_version=20020328
gccnewlib_rpm_release=3
gdb_version=5.2
-gdb_patch_version=20020612
-gdb_rpm_release=1
+gdb_patch_version=20030211
+gdb_rpm_release=2
rtems_version=ss-20000726
rtems_rpm_release=1
rpm_build_root=%{_tmppath}
gcc3newlib_version=1.11.0
-gcc3newlib_patch_version=20030120
+gcc3newlib_patch_version=20030203
gcc3_version=3.2.1
gcc3_patch_version=20021209
-gcc3newlib_rpm_release=1
+gcc3newlib_rpm_release=2