summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2002-04-16 23:43:23 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2002-04-16 23:43:23 +0000
commit3f60b2aaff9346f5cf6e83eddabf6a7daaec650a (patch)
tree1c3cc1b5734a582a053a088b59b176b34490da5f
parent2002-04-14 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff)
downloadrtems-3f60b2aaff9346f5cf6e83eddabf6a7daaec650a.tar.bz2
2001-04-16 Joel Sherrill <joel@OARcorp.com>
* .cvsignore: Added files added by automake 1.6.1. * setup.def: New shot at gcc 3.0.4 RPMs. * binutils/Makefile.am, gdb/Makefile.am, rtems/Makefile.am: Deleted m68k-rtemself. * gcc3newlib/gccnewlib.add: Commented out host/target OS check.
-rw-r--r--scripts/.cvsignore3
-rw-r--r--scripts/ChangeLog8
-rw-r--r--scripts/binutils/Makefile.am5
-rw-r--r--scripts/gcc3newlib/gccnewlib.add6
-rw-r--r--scripts/gdb/Makefile.am3
-rw-r--r--scripts/rtems/Makefile.am3
-rw-r--r--scripts/setup.def4
7 files changed, 17 insertions, 15 deletions
diff --git a/scripts/.cvsignore b/scripts/.cvsignore
index c5746c522e..8f830209f5 100644
--- a/scripts/.cvsignore
+++ b/scripts/.cvsignore
@@ -11,9 +11,12 @@ config.status
config.sub
configure
depcomp
+install-sh
+missing
mkbinutilspec
mkbspspec
mkgccnewlibspec
mkgcc3newlibspec
mkgdbspec
+mkinstalldirs
setup.cache
diff --git a/scripts/ChangeLog b/scripts/ChangeLog
index 0d987c79f5..3a5db1d570 100644
--- a/scripts/ChangeLog
+++ b/scripts/ChangeLog
@@ -1,3 +1,11 @@
+2001-04-16 Joel Sherrill <joel@OARcorp.com>
+
+ * .cvsignore: Added files added by automake 1.6.1.
+ * setup.def: New shot at gcc 3.0.4 RPMs.
+ * binutils/Makefile.am, gdb/Makefile.am, rtems/Makefile.am:
+ Deleted m68k-rtemself.
+ * gcc3newlib/gccnewlib.add: Commented out host/target OS check.
+
2002-04-14 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* autotools/automake-rtems.spec.in: Update to automake-1.6.1.
diff --git a/scripts/binutils/Makefile.am b/scripts/binutils/Makefile.am
index 272514f6a8..ecce3e7403 100644
--- a/scripts/binutils/Makefile.am
+++ b/scripts/binutils/Makefile.am
@@ -39,9 +39,6 @@ i960-rtems-$(BINUTILSVERS).spec: $(MKBINUTILSSPEC_DEPS)
m68k-rtems-$(BINUTILSVERS).spec: $(MKBINUTILSSPEC_DEPS)
$(MKBINUTILSSPEC) -cfg $(top_builddir)/setup.cache -o . m68k-rtems
-m68k-rtemself-$(BINUTILSVERS).spec: $(MKBINUTILSSPEC_DEPS)
- $(MKBINUTILSSPEC) -cfg $(top_builddir)/setup.cache -o . m68k-rtemself
-
mips64orion-rtems-$(BINUTILSVERS).spec: $(MKBINUTILSSPEC_DEPS)
$(MKBINUTILSSPEC) -cfg $(top_builddir)/setup.cache -o . mips64orion-rtems
mips-rtems-$(BINUTILSVERS).spec: $(MKBINUTILSSPEC_DEPS)
@@ -64,7 +61,7 @@ RPM_SPECS_DATA = \
c4x-rtems-$(BINUTILSVERS).spec h8300-rtems-$(BINUTILSVERS).spec \
hppa1.1-rtems-$(BINUTILSVERS).spec \
i386-rtems-$(BINUTILSVERS).spec i960-rtems-$(BINUTILSVERS).spec \
- m68k-rtems-$(BINUTILSVERS).spec m68k-rtemself-$(BINUTILSVERS).spec \
+ m68k-rtems-$(BINUTILSVERS).spec \
mips-rtems-$(BINUTILSVERS).spec mips64orion-rtems-$(BINUTILSVERS).spec \
powerpc-rtems-$(BINUTILSVERS).spec sh-rtems-$(BINUTILSVERS).spec \
sh-rtemself-$(BINUTILSVERS).spec sparc-rtems-$(BINUTILSVERS).spec
diff --git a/scripts/gcc3newlib/gccnewlib.add b/scripts/gcc3newlib/gccnewlib.add
index c9feace299..8de0ed8626 100644
--- a/scripts/gcc3newlib/gccnewlib.add
+++ b/scripts/gcc3newlib/gccnewlib.add
@@ -73,9 +73,9 @@ This is gcc's and newlib C Library's sources with patches for RTEMS.
cd build
# HACK: This should be %{target} != %{build}, but SuSE's rpm screws it.
-%if "%{_target_os}" != "%{_build_os}"
- CONFIGURE_ARGS="--build=%{_build} --host=%{_target}"
-%endif
+# %if "%{_target_os}" != "%{_build_os}"
+# CONFIGURE_ARGS="--build=%{_build} --host=%{_target}"
+# %endif
../gcc-@gcc_version@/configure $CONFIGURE_ARGS --target=@target_alias@ \
--with-gnu-as --with-gnu-ld --with-newlib --verbose \
diff --git a/scripts/gdb/Makefile.am b/scripts/gdb/Makefile.am
index fb83430fc7..d3c35b7e7a 100644
--- a/scripts/gdb/Makefile.am
+++ b/scripts/gdb/Makefile.am
@@ -38,9 +38,6 @@ i960-rtems-$(GDBVERS).spec: $(MKGDBSPEC_DEPS)
m68k-rtems-$(GDBVERS).spec: $(MKGDBSPEC_DEPS)
$(MKGDBSPEC) -cfg $(top_builddir)/setup.cache -o . m68k-rtems
-m68k-rtemself-$(GDBVERS).spec: $(MKGDBSPEC_DEPS)
- $(MKGDBSPEC) -cfg $(top_builddir)/setup.cache -o . m68k-rtemself
-
mips64orion-rtems-$(GDBVERS).spec: $(MKGDBSPEC_DEPS)
$(MKGDBSPEC) -cfg $(top_builddir)/setup.cache -o . mips64orion-rtems
diff --git a/scripts/rtems/Makefile.am b/scripts/rtems/Makefile.am
index 0a84a5c2a3..05aa5e65c0 100644
--- a/scripts/rtems/Makefile.am
+++ b/scripts/rtems/Makefile.am
@@ -20,9 +20,6 @@ i960-rtems-cvme961-$(BSPVERS).spec: $(MKBSPSPEC_DEPS)
m68k-rtems-gen68360-$(BSPVERS).spec: $(MKBSPSPEC_DEPS)
$(MKBSPSPEC) -cfg $(top_builddir)/setup.cache -o . m68k-rtems gen68360
-m68k-rtemself-gen68360-$(BSPVERS).spec: $(MKBSPSPEC_DEPS)
- $(MKBSPSPEC) -cfg $(top_builddir)/setup.cache -o . m68k-rtemself gen68360
-
mips64orion-rtems-p4600-$(BSPVERS).spec: $(MKBSPSPEC_DEPS)
$(MKBSPSPEC) -cfg $(top_builddir)/setup.cache -o . mips64orion-rtems p4600
diff --git a/scripts/setup.def b/scripts/setup.def
index 5153b0d635..7cdd39cfc7 100644
--- a/scripts/setup.def
+++ b/scripts/setup.def
@@ -20,5 +20,5 @@ rpm_build_root=/tmp
gcc3newlib_version=1.10.0
gcc3newlib_patch_version=20020322
gcc3_version=3.0.4
-gcc3_patch_version=20020322
-gcc3newlib_rpm_release=1
+gcc3_patch_version=20020415
+gcc3newlib_rpm_release=2