From 2fa1b3fa04e9f68f982fda4d13605a113b64641d Mon Sep 17 00:00:00 2001
From: Ralf Corsepius <ralf.corsepius@rtems.org>
Date: Tue, 20 Feb 2007 04:47:29 +0000
Subject: Sync with rtems-4.8.

---
 contrib/crossrpms/gcc/build.add         | 2 +-
 contrib/crossrpms/gcc/gccnewlib.add     | 4 ++--
 contrib/crossrpms/gcc/prep.add          | 4 ++--
 contrib/crossrpms/rtems4.7/gcc-prep.add | 6 +++---
 contrib/crossrpms/rtems4.7/gcc.am       | 1 +
 5 files changed, 9 insertions(+), 8 deletions(-)

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 00e6f07a71..4bc3044b68 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.7/gcc-prep.add b/contrib/crossrpms/rtems4.7/gcc-prep.add
index 9fa41305da..cf884402aa 100644
--- a/contrib/crossrpms/rtems4.7/gcc-prep.add
+++ b/contrib/crossrpms/rtems4.7/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.7/gcc.am b/contrib/crossrpms/rtems4.7/gcc.am
index 75e441129d..08e28d5a92 100644
--- a/contrib/crossrpms/rtems4.7/gcc.am
+++ b/contrib/crossrpms/rtems4.7/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" \
-- 
cgit v1.2.3