diff options
| author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2009-11-27 06:56:20 +0000 |
|---|---|---|
| committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2009-11-27 06:56:20 +0000 |
| commit | 3415fab7dd53ee6c45077b633893d58ced440734 (patch) | |
| tree | 1447ee453c667545c72696e08aa2681a02a2ba3d | |
| parent | Upgrade to 4.9.3 (diff) | |
| download | rtems-3415fab7dd53ee6c45077b633893d58ced440734.tar.bz2 | |
Sync with rtems4.10.
| -rw-r--r-- | contrib/crossrpms/rtems4.9/gcc-prep.add | 9 | ||||
| -rw-r--r-- | contrib/crossrpms/rtems4.9/gcc.am | 6 |
2 files changed, 5 insertions, 10 deletions
diff --git a/contrib/crossrpms/rtems4.9/gcc-prep.add b/contrib/crossrpms/rtems4.9/gcc-prep.add index cf884402aa..db1aa878d5 100644 --- a/contrib/crossrpms/rtems4.9/gcc-prep.add +++ b/contrib/crossrpms/rtems4.9/gcc-prep.add @@ -1,9 +1,2 @@ -%if "%{gcc_version}" < "4.1.0" - sed -e 's/\(version_string.* = \"[^\"]*\)/\1 (RTEMS gcc-%{gcc_version}\/newlib-%{newlib_version}-%release)/' \ - 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_pkgvers}/gcc/version.c > gcc-%{gcc_pkgvers}/gcc/version.c~ -%endif - mv gcc-%{gcc_pkgvers}/gcc/version.c~ gcc-%{gcc_pkgvers}/gcc/version.c +echo "RTEMS gcc-%{gcc_version}-@GCC_RPMREL@\/newlib-%{newlib_version}-@NEWLIB_RPMREL@" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE diff --git a/contrib/crossrpms/rtems4.9/gcc.am b/contrib/crossrpms/rtems4.9/gcc.am index 66cf59b8d0..f7dd7a764c 100644 --- a/contrib/crossrpms/rtems4.9/gcc.am +++ b/contrib/crossrpms/rtems4.9/gcc.am @@ -19,12 +19,14 @@ GCC_SUBPACKAGES += $(top_srcdir)/gcc/target-objc.add GCC_SUBPACKAGES += $(top_srcdir)/gcc/target-newlib.add GCC_SUBPACKAGES += $(top_srcdir)/gcc/base-newlib.add -$(TARGET)-gcc.spec.in: $(GCC_SUBPACKAGES) Makefile.am $(srcdir)/gcc-sources.add $(srcdir)/../gcc-prep.add - cat $(GCC_SUBPACKAGES) | sed \ +$(TARGET)-gcc.spec.in: $(GCC_SUBPACKAGES) Makefile.am $(srcdir)/gcc-sources.add $(srcdir)/../gcc-prep.add $(srcdir)/../gcc.am + cat $(GCC_SUBPACKAGES) \ + | sed \ -e "/[@]SOURCES[@]/r $(srcdir)/gcc-sources.add" \ -e "/[@]SOURCES[@]/d" \ -e "/[@]PREP[@]/r $(srcdir)/../gcc-prep.add" \ -e "/[@]PREP[@]/d" \ + | sed \ -e "s/[@]GCC_VERS[@]/$(GCC_VERS)/g" \ -e "s/[@]GCC_PKGVERS[@]/$(GCC_PKGVERS)/g" \ -e "s/[@]GCC_RPMREL[@]/$(GCC_RPMREL)%{?dist}/g" \ |