From 615b6c9fc836a65076158652ed10ada058d0cb40 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Thu, 9 Nov 2006 14:28:50 +0000 Subject: Introduce GCC_PKGVERS --- contrib/crossrpms/gcc/build.add | 2 +- contrib/crossrpms/gcc/gccnewlib.add | 4 ++-- contrib/crossrpms/gcc/prep.add | 4 ++-- contrib/crossrpms/rtems4.8/arm/Makefile.am | 1 + contrib/crossrpms/rtems4.8/avr/Makefile.am | 3 ++- contrib/crossrpms/rtems4.8/bfin/Makefile.am | 11 +++++------ contrib/crossrpms/rtems4.8/gcc-prep.add | 6 +++--- contrib/crossrpms/rtems4.8/gcc.am | 1 + contrib/crossrpms/rtems4.8/h8300/Makefile.am | 1 + contrib/crossrpms/rtems4.8/i386/Makefile.am | 1 + contrib/crossrpms/rtems4.8/m68k/Makefile.am | 1 + contrib/crossrpms/rtems4.8/mips/Makefile.am | 1 + contrib/crossrpms/rtems4.8/powerpc/Makefile.am | 1 + contrib/crossrpms/rtems4.8/sh/Makefile.am | 1 + contrib/crossrpms/rtems4.8/sparc/Makefile.am | 1 + contrib/crossrpms/rtems4.8/tic4x/Makefile.am | 1 + 16 files changed, 25 insertions(+), 15 deletions(-) (limited to 'contrib') diff --git a/contrib/crossrpms/gcc/build.add b/contrib/crossrpms/gcc/build.add index 80e65bd547..4528161686 100644 --- a/contrib/crossrpms/gcc/build.add +++ b/contrib/crossrpms/gcc/build.add @@ -30,7 +30,7 @@ %endif CC="%{__cc} ${RPM_OPT_FLAGS}" \ - ../gcc-%{gcc_version}/configure \ + ../gcc-%{gcc_pkgvers}/configure \ --prefix=%{_prefix} \ --bindir=%{_bindir} \ --includedir=%{_includedir} \ diff --git a/contrib/crossrpms/gcc/gccnewlib.add b/contrib/crossrpms/gcc/gccnewlib.add index aaad153440..56d2be06a3 100644 --- a/contrib/crossrpms/gcc/gccnewlib.add +++ b/contrib/crossrpms/gcc/gccnewlib.add @@ -1,6 +1,6 @@ -%define gcc_pkgvers @GCC_VERS@ -%define gcc_version %{expand:%(echo "@GCC_VERS@" | sed -e 's,-.*,,')} +%define gcc_pkgvers @GCC_PKGVERS@ +%define gcc_version @GCC_VERS@ %define gcc_rpmvers %{expand:%(echo "@GCC_VERS@" | tr - _ )} %if %build_newlib diff --git a/contrib/crossrpms/gcc/prep.add b/contrib/crossrpms/gcc/prep.add index 183eecdb5e..93817c5348 100644 --- a/contrib/crossrpms/gcc/prep.add +++ b/contrib/crossrpms/gcc/prep.add @@ -35,12 +35,12 @@ cd newlib-%{newlib_version} %{?PATCH50:%patch50 -p1} cd .. # Copy the C library into gcc's source tree - ln -s ../newlib-%{newlib_version}/newlib gcc-%{gcc_version} + ln -s ../newlib-%{newlib_version}/newlib gcc-%{gcc_pkgvers} %endif @PREP@ # Fix timestamps - cd gcc-%{gcc_version} + cd gcc-%{gcc_pkgvers} contrib/gcc_update --touch cd .. diff --git a/contrib/crossrpms/rtems4.8/arm/Makefile.am b/contrib/crossrpms/rtems4.8/arm/Makefile.am index d5718e0bfc..0a5bc99cad 100644 --- a/contrib/crossrpms/rtems4.8/arm/Makefile.am +++ b/contrib/crossrpms/rtems4.8/arm/Makefile.am @@ -9,6 +9,7 @@ BINUTILS_RPMREL = 1 include ../binutils.am GCC_VERS = 4.1.1 +GCC_PKGVERS = $(GCC_VERS) GCC_RPMREL = 2 NEWLIB_VERS = 1.14.0 include ../gcc.am diff --git a/contrib/crossrpms/rtems4.8/avr/Makefile.am b/contrib/crossrpms/rtems4.8/avr/Makefile.am index 13a072afb6..ffc5d2b7c7 100644 --- a/contrib/crossrpms/rtems4.8/avr/Makefile.am +++ b/contrib/crossrpms/rtems4.8/avr/Makefile.am @@ -9,10 +9,11 @@ BINUTILS_RPMREL = 1 include ../binutils.am GCC_VERS = 4.0.3 +GCC_PKGVERS = $(GCC_VERS) GCC_RPMREL = 2 NEWLIB_VERS = 1.14.0 include ../gcc.am -GCC_OPTS += +GCC_OPTS += --disable-infos GDB_VERS = 6.5 GDB_RPMREL = 1 diff --git a/contrib/crossrpms/rtems4.8/bfin/Makefile.am b/contrib/crossrpms/rtems4.8/bfin/Makefile.am index 9f75081ccb..f535a10335 100644 --- a/contrib/crossrpms/rtems4.8/bfin/Makefile.am +++ b/contrib/crossrpms/rtems4.8/bfin/Makefile.am @@ -8,14 +8,13 @@ BINUTILS_VERS = 2.17 BINUTILS_RPMREL = 1 include ../binutils.am -GCC_VERS = 4.1.1 -GCC_RPMREL = 2 +GCC_VERS = 4.2.0 +GCC_PKGVERS = 4.2-20061031 +GCC_RPMREL = 3 NEWLIB_VERS = 1.14.0 include ../gcc.am -## GCC_OPTS += --languages=cxx -## I really would like to get these options passed through but do not -## know how yet. So I am building with this command. -## optargs="--disable-libssp --disable-libstdcxx-pch" rpmbuild -ba XXX.spec +# ATM, we don't want info's from bleeding edge GCC +GCC_OPTS += --disable-infos GDB_VERS = 6.5 GDB_RPMREL = 1 diff --git a/contrib/crossrpms/rtems4.8/gcc-prep.add b/contrib/crossrpms/rtems4.8/gcc-prep.add index 9fa41305da..cf884402aa 100644 --- a/contrib/crossrpms/rtems4.8/gcc-prep.add +++ b/contrib/crossrpms/rtems4.8/gcc-prep.add @@ -1,9 +1,9 @@ %if "%{gcc_version}" < "4.1.0" sed -e 's/\(version_string.* = \"[^\"]*\)/\1 (RTEMS gcc-%{gcc_version}\/newlib-%{newlib_version}-%release)/' \ - gcc-%{gcc_version}/gcc/version.c > gcc-%{gcc_version}/gcc/version.c~ + gcc-%{gcc_pkgvers}/gcc/version.c > gcc-%{gcc_pkgvers}/gcc/version.c~ %else sed -e 's/^#define VERSUFFIX.*$/#define VERSUFFIX \" (RTEMS gcc-%{gcc_version}\/newlib-%{newlib_version}-%{release})\"/' \ - gcc-%{gcc_version}/gcc/version.c > gcc-%{gcc_version}/gcc/version.c~ + gcc-%{gcc_pkgvers}/gcc/version.c > gcc-%{gcc_pkgvers}/gcc/version.c~ %endif - mv gcc-%{gcc_version}/gcc/version.c~ gcc-%{gcc_version}/gcc/version.c + mv gcc-%{gcc_pkgvers}/gcc/version.c~ gcc-%{gcc_pkgvers}/gcc/version.c diff --git a/contrib/crossrpms/rtems4.8/gcc.am b/contrib/crossrpms/rtems4.8/gcc.am index 75e441129d..08e28d5a92 100644 --- a/contrib/crossrpms/rtems4.8/gcc.am +++ b/contrib/crossrpms/rtems4.8/gcc.am @@ -26,6 +26,7 @@ $(TARGET)-gcc.spec.in: $(GCC_SUBPACKAGES) Makefile.am $(srcdir)/gcc-sources.add -e "/[@]PREP[@]/r $(srcdir)/../gcc-prep.add" \ -e "/[@]PREP[@]/d" \ -e "s/[@]GCC_VERS[@]/$(GCC_VERS)/g" \ + -e "s/[@]GCC_PKGVERS[@]/$(GCC_PKGVERS)/g" \ -e "s/[@]GCC_RPMREL[@]/$(GCC_RPMREL)/g" \ -e "s/[@]NEWLIB_VERS[@]/$(NEWLIB_VERS)/g" \ -e "/--with-sysroot/d" \ diff --git a/contrib/crossrpms/rtems4.8/h8300/Makefile.am b/contrib/crossrpms/rtems4.8/h8300/Makefile.am index 658daf2463..fc6fedb030 100644 --- a/contrib/crossrpms/rtems4.8/h8300/Makefile.am +++ b/contrib/crossrpms/rtems4.8/h8300/Makefile.am @@ -9,6 +9,7 @@ BINUTILS_RPMREL = 1 include ../binutils.am GCC_VERS = 4.1.1 +GCC_PKGVERS = $(GCC_VERS) GCC_RPMREL = 2 NEWLIB_VERS = 1.14.0 include ../gcc.am diff --git a/contrib/crossrpms/rtems4.8/i386/Makefile.am b/contrib/crossrpms/rtems4.8/i386/Makefile.am index b82a2d1e9d..1ea16fc9d9 100644 --- a/contrib/crossrpms/rtems4.8/i386/Makefile.am +++ b/contrib/crossrpms/rtems4.8/i386/Makefile.am @@ -9,6 +9,7 @@ BINUTILS_RPMREL = 1 include ../binutils.am GCC_VERS = 4.1.1 +GCC_PKGVERS = $(GCC_VERS) GCC_RPMREL = 2 NEWLIB_VERS = 1.14.0 include ../gcc.am diff --git a/contrib/crossrpms/rtems4.8/m68k/Makefile.am b/contrib/crossrpms/rtems4.8/m68k/Makefile.am index cbd866240a..80c6d60632 100644 --- a/contrib/crossrpms/rtems4.8/m68k/Makefile.am +++ b/contrib/crossrpms/rtems4.8/m68k/Makefile.am @@ -9,6 +9,7 @@ BINUTILS_RPMREL = 1 include ../binutils.am GCC_VERS = 4.1.1 +GCC_PKGVERS = $(GCC_VERS) GCC_RPMREL = 2 NEWLIB_VERS = 1.14.0 include ../gcc.am diff --git a/contrib/crossrpms/rtems4.8/mips/Makefile.am b/contrib/crossrpms/rtems4.8/mips/Makefile.am index 98fdef1700..686ea05e15 100644 --- a/contrib/crossrpms/rtems4.8/mips/Makefile.am +++ b/contrib/crossrpms/rtems4.8/mips/Makefile.am @@ -9,6 +9,7 @@ BINUTILS_RPMREL = 1 include ../binutils.am GCC_VERS = 4.1.1 +GCC_PKGVERS = $(GCC_VERS) GCC_RPMREL = 2 NEWLIB_VERS = 1.14.0 include ../gcc.am diff --git a/contrib/crossrpms/rtems4.8/powerpc/Makefile.am b/contrib/crossrpms/rtems4.8/powerpc/Makefile.am index 53fd7b6d50..7e43ffe351 100644 --- a/contrib/crossrpms/rtems4.8/powerpc/Makefile.am +++ b/contrib/crossrpms/rtems4.8/powerpc/Makefile.am @@ -9,6 +9,7 @@ BINUTILS_RPMREL = 1 include ../binutils.am GCC_VERS = 4.1.1 +GCC_PKGVERS = $(GCC_VERS) GCC_RPMREL = 2 NEWLIB_VERS = 1.14.0 include ../gcc.am diff --git a/contrib/crossrpms/rtems4.8/sh/Makefile.am b/contrib/crossrpms/rtems4.8/sh/Makefile.am index 66e3221af4..9ef05fed71 100644 --- a/contrib/crossrpms/rtems4.8/sh/Makefile.am +++ b/contrib/crossrpms/rtems4.8/sh/Makefile.am @@ -9,6 +9,7 @@ BINUTILS_RPMREL = 1 include ../binutils.am GCC_VERS = 4.1.1 +GCC_PKGVERS = $(GCC_VERS) GCC_RPMREL = 2 NEWLIB_VERS = 1.14.0 include ../gcc.am diff --git a/contrib/crossrpms/rtems4.8/sparc/Makefile.am b/contrib/crossrpms/rtems4.8/sparc/Makefile.am index 9744d006bc..3e14388601 100644 --- a/contrib/crossrpms/rtems4.8/sparc/Makefile.am +++ b/contrib/crossrpms/rtems4.8/sparc/Makefile.am @@ -9,6 +9,7 @@ BINUTILS_RPMREL = 1 include ../binutils.am GCC_VERS = 4.1.1 +GCC_PKGVERS = $(GCC_VERS) GCC_RPMREL = 2 NEWLIB_VERS = 1.14.0 include ../gcc.am diff --git a/contrib/crossrpms/rtems4.8/tic4x/Makefile.am b/contrib/crossrpms/rtems4.8/tic4x/Makefile.am index 880b403896..d1a92ff0db 100644 --- a/contrib/crossrpms/rtems4.8/tic4x/Makefile.am +++ b/contrib/crossrpms/rtems4.8/tic4x/Makefile.am @@ -9,6 +9,7 @@ BINUTILS_RPMREL = 1 include ../binutils.am GCC_VERS = 3.4.6 +GCC_PKGVERS = $(GCC_VERS) GCC_RPMREL = 2 NEWLIB_VERS = 1.14.0 include ../gcc.am -- cgit v1.2.3