Author: glen Date: Thu Feb 7 13:25:13 2008 GMT
Module: SPECS Tag: HEAD
---- Log message:
- use %kgcc, %kgcc_package
---- Files affected:
SPECS:
kernel-vanilla.spec (1.110 -> 1.111)
---- Diffs:
================================================================
Index: SPECS/kernel-vanilla.spec
diff -u SPECS/kernel-vanilla.spec:1.110 SPECS/kernel-vanilla.spec:1.111
--- SPECS/kernel-vanilla.spec:1.110 Thu Feb 7 14:15:45 2008
+++ SPECS/kernel-vanilla.spec Thu Feb 7 14:25:08 2008
@@ -70,9 +70,9 @@
BuildRequires: elftoaout
%endif
%ifarch ppc ppc64
-BuildRequires: gcc >= 5:3.4
+BuildRequires: %{kgcc_package} >= 5:3.4
%else
-BuildRequires: gcc >= 5:3.2
+BuildRequires: %{kgcc_package} >= 5:3.2
%endif
BuildRequires: module-init-tools
# for hostname command
@@ -104,8 +104,6 @@
%if %{with gcc4}
# add suffix, but allow ccache, etc in ~/.rpmmacros
%{expand:%%define __cc %(echo '%__cc' | sed -e 's,-gcc,-gcc4,')}
-%{expand:%%define __cxx %(echo '%__cxx' | sed -e 's,-g++,-g++4,')}
-%{expand:%%define __cpp %(echo '%__cpp' | sed -e 's,-gcc,-gcc4,')}
%endif
%ifarch %{ix86} %{x8664}
@@ -131,18 +129,18 @@
%define srcdir %{topdir}/linux-%{_basever}
%define objdir %{topdir}/o
-%define CommonOpts HOSTCC="%{__cc}" HOSTCFLAGS="-Wall
-Wstrict-prototypes %{rpmcflags} -fomit-frame-pointer" O=%{objdir}
+%define CommonOpts HOSTCC="%{kgcc}" HOSTCFLAGS="-Wall
-Wstrict-prototypes %{rpmcflags} -fomit-frame-pointer" O=%{objdir}
%if "%{_target_base_arch}" != "%{_arch}"
%define MakeOpts %{CommonOpts} ARCH=%{_target_base_arch}
CROSS_COMPILE=%{_target_cpu}-pld-linux-
%define DepMod /bin/true
%if "%{_arch}" == "x86_64" && "%{_target_base_arch}" == "i386"
- %define MakeOpts %{CommonOpts} CC="%{__cc}" ARCH=%{_target_base_arch}
+ %define MakeOpts %{CommonOpts} CC="%{kgcc}" ARCH=%{_target_base_arch}
%define DepMod /sbin/depmod
%endif
%else
- %define MakeOpts %{CommonOpts} CC="%{__cc}"
+ %define MakeOpts %{CommonOpts} CC="%{kgcc}"
%define DepMod /sbin/depmod
%endif
@@ -778,6 +776,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.111 2008-02-07 13:25:08 glen
+- use %kgcc, %kgcc_package
+
Revision 1.110 2008-02-07 13:15:45 glen
- gcc requirement is actually for ppc (-mcpu=440)
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/kernel-vanilla.spec?r1=1.110&r2=1.111&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
