Sync with rtems4.10.

This commit is contained in:
Ralf Corsepius
2009-11-27 06:56:20 +00:00
parent c29dc1f758
commit 3415fab7dd
2 changed files with 5 additions and 10 deletions

View File

@@ -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

View File

@@ -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" \