packages: apache-mod_pagespeed/apache-mod_pagespeed.spec - force gcc4 on ac

[glen]

Author: glen                         Date: Sat Oct  8 10:45:57 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- force gcc4 on ac

---- Files affected:
packages/apache-mod_pagespeed:
   apache-mod_pagespeed.spec (1.9 -> 1.10) 

---- Diffs:

================================================================
Index: packages/apache-mod_pagespeed/apache-mod_pagespeed.spec
diff -u packages/apache-mod_pagespeed/apache-mod_pagespeed.spec:1.9 packages/apache-mod_pagespeed/apache-mod_pagespeed.spec:1.10
--- packages/apache-mod_pagespeed/apache-mod_pagespeed.spec:1.9	Thu Jun 30 09:09:16 2011
+++ packages/apache-mod_pagespeed/apache-mod_pagespeed.spec	Sat Oct  8 12:45:52 2011
@@ -32,6 +32,14 @@
 #  "opencv_src": "https://code.ros.org/svn/opencv/tags/2.1",
 #  "gflags_root": "http://google-gflags.googlecode.com/svn/tags/gflags-1.3/src",
 #  "google_sparsehash_root": "http://google-sparsehash.googlecode.com/svn/tags/sparsehash-1.8.1/src",
+
+%if "%{pld_release}" == "ac"
+# 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
+
 # - use only source for modpagespeed if system headers are used (remove copies from tarball)
 %define		mod_name	pagespeed
 %define 	apxs		%{_sbindir}/apxs
@@ -46,9 +54,13 @@
 URL:		http://code.google.com/p/modpagespeed/
 BuildRequires:	%{apxs}
 BuildRequires:	apache-devel >= 2.2
-BuildRequires:	libstdc++-devel >= 6:4.2
+BuildRequires:	libstdc++-devel >= 5:4.0
 BuildRequires:	python-devel >= 1:2.6
 BuildRequires:	rpmbuild(macros) >= 1.268
+# gcc4 might be installed, but not current __cc
+%if "%(echo %{cc_version} | cut -d. -f1,2)" < "4.0"
+BuildRequires:	__cc >= 4.0
+%endif
 Requires:	apache(modules-api) = %apache_modules_api
 Requires:	apache-mod_authz_host
 Suggests:	apache-mod_deflate
@@ -140,6 +152,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.10  2011/10/08 10:45:52  glen
+- force gcc4 on ac
+
 Revision 1.9  2011/06/30 07:09:16  glen
 - builds with gcc 4.5.2
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/apache-mod_pagespeed/apache-mod_pagespeed.spec?r1=1.9&r2=1.10&f=u