Author: glen Date: Thu Apr 10 20:14:46 2008 GMT
Module: SPECS Tag: HEAD
---- Log message:
- kgcc/kgcc_package instead of gcc4 bcond
---- Files affected:
SPECS:
kernel-desktop.spec (1.182 -> 1.183)
---- Diffs:
================================================================
Index: SPECS/kernel-desktop.spec
diff -u SPECS/kernel-desktop.spec:1.182 SPECS/kernel-desktop.spec:1.183
--- SPECS/kernel-desktop.spec:1.182 Wed Apr 9 15:44:30 2008
+++ SPECS/kernel-desktop.spec Thu Apr 10 22:14:41 2008
@@ -30,7 +30,6 @@
%bcond_with laptop # build with HZ=100
%bcond_with verbose # verbose build (V=1)
%bcond_with pae # build PAE (HIGHMEM64G)
support on uniprocessor
-%bcond_with gcc4 # build with gcc4
%{?debug:%define with_verbose 1}
@@ -239,8 +238,7 @@
URL: http://www.kernel.org/
BuildRequires: /sbin/depmod
BuildRequires: binutils >= 3:2.14.90.0.7
-%{!?with_gcc4:BuildRequires: gcc >= 5:3.2}
-%{?with_gcc4:BuildRequires: gcc >= 5:4.1.1}
+BuildRequires: %{kgcc_package} >= 5:3.2
BuildRequires: module-init-tools
# for hostname command
BuildRequires: net-tools
@@ -275,13 +273,6 @@
ExclusiveOS: Linux
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
-%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}
%define target_arch_dir x86
%else
@@ -305,18 +296,18 @@
%define kernel_release %{version}_%{alt_kernel}-%{_localversion}
%define _kernelsrcdir /usr/src/linux-%{version}_%{alt_kernel}
-%define CommonOpts HOSTCC="%{__cc}" HOSTCFLAGS="-Wall
-Wstrict-prototypes %{rpmcflags} -fomit-frame-pointer"
+%define CommonOpts HOSTCC="%{kgcc}" HOSTCFLAGS="-Wall
-Wstrict-prototypes %{rpmcflags} -fomit-frame-pointer"
%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
@@ -1162,6 +1153,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.183 2008-04-10 20:14:41 glen
+- kgcc/kgcc_package instead of gcc4 bcond
+
Revision 1.182 2008-04-09 13:44:30 shadzik
- missing comma in german description
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/kernel-desktop.spec?r1=1.182&r2=1.183&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
