forked from Imagelibrary/rtems
Introduce GCC_PKGVERS
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 ..
|
||||||
|
|||||||
@@ -9,6 +9,7 @@ BINUTILS_RPMREL = 1
|
|||||||
include ../binutils.am
|
include ../binutils.am
|
||||||
|
|
||||||
GCC_VERS = 4.1.1
|
GCC_VERS = 4.1.1
|
||||||
|
GCC_PKGVERS = $(GCC_VERS)
|
||||||
GCC_RPMREL = 2
|
GCC_RPMREL = 2
|
||||||
NEWLIB_VERS = 1.14.0
|
NEWLIB_VERS = 1.14.0
|
||||||
include ../gcc.am
|
include ../gcc.am
|
||||||
|
|||||||
@@ -9,10 +9,11 @@ BINUTILS_RPMREL = 1
|
|||||||
include ../binutils.am
|
include ../binutils.am
|
||||||
|
|
||||||
GCC_VERS = 4.0.3
|
GCC_VERS = 4.0.3
|
||||||
|
GCC_PKGVERS = $(GCC_VERS)
|
||||||
GCC_RPMREL = 2
|
GCC_RPMREL = 2
|
||||||
NEWLIB_VERS = 1.14.0
|
NEWLIB_VERS = 1.14.0
|
||||||
include ../gcc.am
|
include ../gcc.am
|
||||||
GCC_OPTS +=
|
GCC_OPTS += --disable-infos
|
||||||
|
|
||||||
GDB_VERS = 6.5
|
GDB_VERS = 6.5
|
||||||
GDB_RPMREL = 1
|
GDB_RPMREL = 1
|
||||||
|
|||||||
@@ -8,14 +8,13 @@ BINUTILS_VERS = 2.17
|
|||||||
BINUTILS_RPMREL = 1
|
BINUTILS_RPMREL = 1
|
||||||
include ../binutils.am
|
include ../binutils.am
|
||||||
|
|
||||||
GCC_VERS = 4.1.1
|
GCC_VERS = 4.2.0
|
||||||
GCC_RPMREL = 2
|
GCC_PKGVERS = 4.2-20061031
|
||||||
|
GCC_RPMREL = 3
|
||||||
NEWLIB_VERS = 1.14.0
|
NEWLIB_VERS = 1.14.0
|
||||||
include ../gcc.am
|
include ../gcc.am
|
||||||
## GCC_OPTS += --languages=cxx
|
# ATM, we don't want info's from bleeding edge GCC
|
||||||
## I really would like to get these options passed through but do not
|
GCC_OPTS += --disable-infos
|
||||||
## know how yet. So I am building with this command.
|
|
||||||
## optargs="--disable-libssp --disable-libstdcxx-pch" rpmbuild -ba XXX.spec
|
|
||||||
|
|
||||||
GDB_VERS = 6.5
|
GDB_VERS = 6.5
|
||||||
GDB_RPMREL = 1
|
GDB_RPMREL = 1
|
||||||
|
|||||||
@@ -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" \
|
||||||
|
|||||||
@@ -9,6 +9,7 @@ BINUTILS_RPMREL = 1
|
|||||||
include ../binutils.am
|
include ../binutils.am
|
||||||
|
|
||||||
GCC_VERS = 4.1.1
|
GCC_VERS = 4.1.1
|
||||||
|
GCC_PKGVERS = $(GCC_VERS)
|
||||||
GCC_RPMREL = 2
|
GCC_RPMREL = 2
|
||||||
NEWLIB_VERS = 1.14.0
|
NEWLIB_VERS = 1.14.0
|
||||||
include ../gcc.am
|
include ../gcc.am
|
||||||
|
|||||||
@@ -9,6 +9,7 @@ BINUTILS_RPMREL = 1
|
|||||||
include ../binutils.am
|
include ../binutils.am
|
||||||
|
|
||||||
GCC_VERS = 4.1.1
|
GCC_VERS = 4.1.1
|
||||||
|
GCC_PKGVERS = $(GCC_VERS)
|
||||||
GCC_RPMREL = 2
|
GCC_RPMREL = 2
|
||||||
NEWLIB_VERS = 1.14.0
|
NEWLIB_VERS = 1.14.0
|
||||||
include ../gcc.am
|
include ../gcc.am
|
||||||
|
|||||||
@@ -9,6 +9,7 @@ BINUTILS_RPMREL = 1
|
|||||||
include ../binutils.am
|
include ../binutils.am
|
||||||
|
|
||||||
GCC_VERS = 4.1.1
|
GCC_VERS = 4.1.1
|
||||||
|
GCC_PKGVERS = $(GCC_VERS)
|
||||||
GCC_RPMREL = 2
|
GCC_RPMREL = 2
|
||||||
NEWLIB_VERS = 1.14.0
|
NEWLIB_VERS = 1.14.0
|
||||||
include ../gcc.am
|
include ../gcc.am
|
||||||
|
|||||||
@@ -9,6 +9,7 @@ BINUTILS_RPMREL = 1
|
|||||||
include ../binutils.am
|
include ../binutils.am
|
||||||
|
|
||||||
GCC_VERS = 4.1.1
|
GCC_VERS = 4.1.1
|
||||||
|
GCC_PKGVERS = $(GCC_VERS)
|
||||||
GCC_RPMREL = 2
|
GCC_RPMREL = 2
|
||||||
NEWLIB_VERS = 1.14.0
|
NEWLIB_VERS = 1.14.0
|
||||||
include ../gcc.am
|
include ../gcc.am
|
||||||
|
|||||||
@@ -9,6 +9,7 @@ BINUTILS_RPMREL = 1
|
|||||||
include ../binutils.am
|
include ../binutils.am
|
||||||
|
|
||||||
GCC_VERS = 4.1.1
|
GCC_VERS = 4.1.1
|
||||||
|
GCC_PKGVERS = $(GCC_VERS)
|
||||||
GCC_RPMREL = 2
|
GCC_RPMREL = 2
|
||||||
NEWLIB_VERS = 1.14.0
|
NEWLIB_VERS = 1.14.0
|
||||||
include ../gcc.am
|
include ../gcc.am
|
||||||
|
|||||||
@@ -9,6 +9,7 @@ BINUTILS_RPMREL = 1
|
|||||||
include ../binutils.am
|
include ../binutils.am
|
||||||
|
|
||||||
GCC_VERS = 4.1.1
|
GCC_VERS = 4.1.1
|
||||||
|
GCC_PKGVERS = $(GCC_VERS)
|
||||||
GCC_RPMREL = 2
|
GCC_RPMREL = 2
|
||||||
NEWLIB_VERS = 1.14.0
|
NEWLIB_VERS = 1.14.0
|
||||||
include ../gcc.am
|
include ../gcc.am
|
||||||
|
|||||||
@@ -9,6 +9,7 @@ BINUTILS_RPMREL = 1
|
|||||||
include ../binutils.am
|
include ../binutils.am
|
||||||
|
|
||||||
GCC_VERS = 4.1.1
|
GCC_VERS = 4.1.1
|
||||||
|
GCC_PKGVERS = $(GCC_VERS)
|
||||||
GCC_RPMREL = 2
|
GCC_RPMREL = 2
|
||||||
NEWLIB_VERS = 1.14.0
|
NEWLIB_VERS = 1.14.0
|
||||||
include ../gcc.am
|
include ../gcc.am
|
||||||
|
|||||||
@@ -9,6 +9,7 @@ BINUTILS_RPMREL = 1
|
|||||||
include ../binutils.am
|
include ../binutils.am
|
||||||
|
|
||||||
GCC_VERS = 3.4.6
|
GCC_VERS = 3.4.6
|
||||||
|
GCC_PKGVERS = $(GCC_VERS)
|
||||||
GCC_RPMREL = 2
|
GCC_RPMREL = 2
|
||||||
NEWLIB_VERS = 1.14.0
|
NEWLIB_VERS = 1.14.0
|
||||||
include ../gcc.am
|
include ../gcc.am
|
||||||
|
|||||||
Reference in New Issue
Block a user