SPECS: kernel-desktop.spec - add gcc4 bcond

glen glen at pld-linux.org
Mon Jan 21 11:07:44 CET 2008


Author: glen                         Date: Mon Jan 21 10:07:44 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- add gcc4 bcond

---- Files affected:
SPECS:
   kernel-desktop.spec (1.150 -> 1.151) 

---- Diffs:

================================================================
Index: SPECS/kernel-desktop.spec
diff -u SPECS/kernel-desktop.spec:1.150 SPECS/kernel-desktop.spec:1.151
--- SPECS/kernel-desktop.spec:1.150	Sat Jan 19 19:22:36 2008
+++ SPECS/kernel-desktop.spec	Mon Jan 21 11:07:39 2008
@@ -29,6 +29,7 @@
 %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}
 
@@ -267,6 +268,13 @@
 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
+
 # No ELF objects there to strip (skips processing 27k files)
 %define		_noautostrip	.*%{_kernelsrcdir}/.*
 %define		_noautochrpath	.*%{_kernelsrcdir}/.*
@@ -1067,6 +1075,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.151  2008-01-21 10:07:39  glen
+- add gcc4 bcond
+
 Revision 1.150  2008-01-19 18:22:36  glen
 - um, no vmlinux on th-ppc
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/kernel-desktop.spec?r1=1.150&r2=1.151&f=u



More information about the pld-cvs-commit mailing list