SPECS (AC-branch): php.spec - system_xmlrpc_epi bcond added

[glen]

Author: glen                         Date: Mon Nov 12 09:52:15 2007 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- system_xmlrpc_epi bcond added

---- Files affected:
SPECS:
   php.spec (1.631.2.56 -> 1.631.2.57) 

---- Diffs:

================================================================
Index: SPECS/php.spec
diff -u SPECS/php.spec:1.631.2.56 SPECS/php.spec:1.631.2.57
--- SPECS/php.spec:1.631.2.56	Mon Nov 12 10:42:49 2007
+++ SPECS/php.spec	Mon Nov 12 10:52:10 2007
@@ -47,6 +47,7 @@
 %bcond_without	apache2		# disable building apache 2.x module
 %bcond_without	fcgi		# disable building FCGI SAPI
 %bcond_without	zts		# disable experimental-zts
+%bcond_with	system_xmlrpc_epi	# use system xmlrpc-epi library (broken on 64bit arches, see http://bugs.php.net/41611)
 %bcond_with	tests		# default off; test process very often hangs on builders; perform "make test"
 %bcond_with	versioning	# build with experimental versioning (to load php4/php5 into same apache)
 
@@ -141,7 +142,10 @@
 BuildRequires:	cyrus-sasl-devel
 BuildRequires:	db-devel >= 4.0
 BuildRequires:	elfutils-devel
-%{?with_xmlrpc:BuildRequires:	expat-devel}
+%if %{with xmlrpc}
+BuildRequires:	expat-devel
+%{?with_system_xmlrpc_epi:BuildRequires:    xmlrpc-epi-devel}
+%endif
 %{?with_fcgi:BuildRequires:	fcgi-devel}
 %{?with_fdf:BuildRequires:	fdftk-devel}
 BuildRequires:	flex
@@ -1613,7 +1617,9 @@
 rm -rf ext/pcre/pcrelib
 rm -rf ext/pdo_sqlite/sqlite
 #rm -rf ext/soap/interop
-#rm -rf ext/xmlrpc/libxmlrpc -- system one is broken on 64bit arches
+%if %{without system_xmlrpc_epi}
+rm -rf ext/xmlrpc/libxmlrpc
+%endif
 
 %ifarch ppc ppc64
 # this test hungs on ac-ppc
@@ -1804,7 +1810,7 @@
 	%{?with_tidy:--with-tidy=shared} \
 	--with-tiff-dir=/usr \
 	%{?with_odbc:--with-unixODBC=shared,/usr} \
-	%{!?with_xmlrpc:--without-xmlrpc}%{?with_xmlrpc:--with-xmlrpc=shared} \
+	%{!?with_xmlrpc:--without-xmlrpc}%{?with_xmlrpc:--with-xmlrpc=shared%{?with_system_xmlrpc_epi:,/usr}} \
 	--with-xsl=shared \
 	--with-zlib=shared \
 	--with-zlib-dir=shared,/usr \
@@ -2751,6 +2757,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.631.2.57  2007-11-12 09:52:10  glen
+- system_xmlrpc_epi bcond added
+
 Revision 1.631.2.56  2007-11-12 09:42:49  glen
 - more sources renumber
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/php.spec?r1=1.631.2.56&r2=1.631.2.57&f=u