Author: glen Date: Sun Oct 31 13:14:17 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- build with gcc4 on ac
---- Files affected:
packages/php-xhp:
php-xhp.spec (1.7 -> 1.8)
---- Diffs:
================================================================
Index: packages/php-xhp/php-xhp.spec
diff -u packages/php-xhp/php-xhp.spec:1.7 packages/php-xhp/php-xhp.spec:1.8
--- packages/php-xhp/php-xhp.spec:1.7 Sun Oct 31 14:09:55 2010
+++ packages/php-xhp/php-xhp.spec Sun Oct 31 14:14:12 2010
@@ -3,6 +3,13 @@
# Conditional build:
%bcond_without tests # build without tests
+%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
+
%define modname xhp
Summary: Inline XML For PHP
Name: php-%{modname}
@@ -20,8 +27,13 @@
BuildRequires: libstdc++-devel >= 5:4.0
BuildRequires: php-devel >= 3:5.2.0
BuildRequires: re2c >= 0.13.5
+BuildRequires: rpm >= 4.4.9-56
BuildRequires: rpmbuild(macros) >= 1.519
%{?requires_php_extension}
+# gcc4 might be installed, but not current __cc
+%if "%(echo %{cc_version} | cut -d. -f1,2)" < "4.0"
+BuildRequires: __cc >= 4.0
+%endif
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
@@ -111,6 +123,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.8 2010/10/31 13:14:12 glen
+- build with gcc4 on ac
+
Revision 1.7 2010/10/31 13:09:55 glen
- it's libstdc++ dep, correct gcc epoch
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/php-xhp/php-xhp.spec?r1=1.7&r2=1.8&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
