diff options
| author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2006-11-09 14:28:50 +0000 |
|---|---|---|
| committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2006-11-09 14:28:50 +0000 |
| commit | 615b6c9fc836a65076158652ed10ada058d0cb40 (patch) | |
| tree | 13a626948fc41be64156e25d5d2a8e52b7f906f3 /contrib/crossrpms/gcc | |
| parent | Upgrade to gcc-4.2.0-20061031. (diff) | |
| download | rtems-615b6c9fc836a65076158652ed10ada058d0cb40.tar.bz2 | |
Introduce GCC_PKGVERS
Diffstat (limited to 'contrib/crossrpms/gcc')
| -rw-r--r-- | contrib/crossrpms/gcc/build.add | 2 | ||||
| -rw-r--r-- | contrib/crossrpms/gcc/gccnewlib.add | 4 | ||||
| -rw-r--r-- | contrib/crossrpms/gcc/prep.add | 4 |
3 files changed, 5 insertions, 5 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 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 .. |