forked from Imagelibrary/rtems
Sync with rtems-4.8.
This commit is contained in:
@@ -30,7 +30,7 @@
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
CC="%{__cc} ${RPM_OPT_FLAGS}" \
|
CC="%{__cc} ${RPM_OPT_FLAGS}" \
|
||||||
../gcc-%{gcc_version}/configure \
|
../gcc-%{gcc_pkgvers}/configure \
|
||||||
--prefix=%{_prefix} \
|
--prefix=%{_prefix} \
|
||||||
--bindir=%{_bindir} \
|
--bindir=%{_bindir} \
|
||||||
--includedir=%{_includedir} \
|
--includedir=%{_includedir} \
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
|
|
||||||
%define gcc_pkgvers @GCC_VERS@
|
%define gcc_pkgvers @GCC_PKGVERS@
|
||||||
%define gcc_version %{expand:%(echo "@GCC_VERS@" | sed -e 's,-.*,,')}
|
%define gcc_version @GCC_VERS@
|
||||||
%define gcc_rpmvers %{expand:%(echo "@GCC_VERS@" | tr - _ )}
|
%define gcc_rpmvers %{expand:%(echo "@GCC_VERS@" | tr - _ )}
|
||||||
|
|
||||||
%if %build_newlib
|
%if %build_newlib
|
||||||
|
|||||||
@@ -35,12 +35,12 @@ cd newlib-%{newlib_version}
|
|||||||
%{?PATCH50:%patch50 -p1}
|
%{?PATCH50:%patch50 -p1}
|
||||||
cd ..
|
cd ..
|
||||||
# Copy the C library into gcc's source tree
|
# 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
|
%endif
|
||||||
|
|
||||||
@PREP@
|
@PREP@
|
||||||
|
|
||||||
# Fix timestamps
|
# Fix timestamps
|
||||||
cd gcc-%{gcc_version}
|
cd gcc-%{gcc_pkgvers}
|
||||||
contrib/gcc_update --touch
|
contrib/gcc_update --touch
|
||||||
cd ..
|
cd ..
|
||||||
|
|||||||
@@ -1,9 +1,9 @@
|
|||||||
%if "%{gcc_version}" < "4.1.0"
|
%if "%{gcc_version}" < "4.1.0"
|
||||||
sed -e 's/\(version_string.* = \"[^\"]*\)/\1 (RTEMS gcc-%{gcc_version}\/newlib-%{newlib_version}-%release)/' \
|
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
|
%else
|
||||||
sed -e 's/^#define VERSUFFIX.*$/#define VERSUFFIX \" (RTEMS gcc-%{gcc_version}\/newlib-%{newlib_version}-%{release})\"/' \
|
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
|
%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
|
||||||
|
|
||||||
|
|||||||
@@ -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[@]/r $(srcdir)/../gcc-prep.add" \
|
||||||
-e "/[@]PREP[@]/d" \
|
-e "/[@]PREP[@]/d" \
|
||||||
-e "s/[@]GCC_VERS[@]/$(GCC_VERS)/g" \
|
-e "s/[@]GCC_VERS[@]/$(GCC_VERS)/g" \
|
||||||
|
-e "s/[@]GCC_PKGVERS[@]/$(GCC_PKGVERS)/g" \
|
||||||
-e "s/[@]GCC_RPMREL[@]/$(GCC_RPMREL)/g" \
|
-e "s/[@]GCC_RPMREL[@]/$(GCC_RPMREL)/g" \
|
||||||
-e "s/[@]NEWLIB_VERS[@]/$(NEWLIB_VERS)/g" \
|
-e "s/[@]NEWLIB_VERS[@]/$(NEWLIB_VERS)/g" \
|
||||||
-e "/--with-sysroot/d" \
|
-e "/--with-sysroot/d" \
|
||||||
|
|||||||
Reference in New Issue
Block a user