packages (PHP_5_2): php/php.spec - build simplexml as shared

[glen]

Author: glen                         Date: Wed Sep 23 10:40:10 2009 GMT
Module: packages                      Tag: PHP_5_2
---- Log message:
- build simplexml as shared

---- Files affected:
packages/php:
   php.spec (1.805.2.14 -> 1.805.2.15) 

---- Diffs:

================================================================
Index: packages/php/php.spec
diff -u packages/php/php.spec:1.805.2.14 packages/php/php.spec:1.805.2.15
--- packages/php/php.spec:1.805.2.14	Wed Sep 23 09:26:53 2009
+++ packages/php/php.spec	Wed Sep 23 12:40:04 2009
@@ -433,6 +433,7 @@
 Summary(ru.UTF-8):	Разделяемые библиотеки для php
 Summary(uk.UTF-8):	Бібліотеки спільного використання для php
 Group:		Libraries
+Requires:	%{name}-simplexml = %{epoch}:%{version}-%{release}
 # because of dlclose() bugs in glibc <= 2.3.4 causing SEGVs on exit
 Requires:	glibc >= 6:2.3.5
 Requires:	php-dirs
@@ -443,7 +444,6 @@
 Provides:	php(overload)
 %{?with_pcre:Provides:	php(pcre)}
 Provides:	php(reflection)
-Provides:	php(simplexml)
 Provides:	php(spl)
 Provides:	php(standard)
 Provides:	php(zend_extension_api) = %{zend_extension_api}
@@ -1861,7 +1861,7 @@
 	--enable-shared \
 	--enable-session=shared \
 	--enable-shmop=shared \
-	--enable-simplexml \
+	--enable-simplexml=shared \
 	--enable-sysvmsg=shared \
 	--enable-sysvsem=shared \
 	--enable-sysvshm=shared \
@@ -1941,16 +1941,17 @@
 %{__make} libtool-sapi LIBTOOL_SAPI=sapi/apache2handler/libphp5.la -f Makefile.apxs2
 %endif
 
+test_args="-dextension_dir=modules -dextension=simplexml.so"
 # CGI
 cp -af php_config.h.cgi main/php_config.h
 rm -rf sapi/cgi/.libs sapi/cgi/*.lo
 %{__make} sapi/cgi/php-cgi -f Makefile.cgi
-[ "$(echo '<?=php_sapi_name();' | ./sapi/cgi/php-cgi -qn)" = cgi ] || exit 1
+[ "$(echo '<?=php_sapi_name();' | ./sapi/cgi/php-cgi -qn $test_args)" = cgi ] || exit 1
 
 # CLI
 cp -af php_config.h.cli main/php_config.h
 %{__make} sapi/cli/php -f Makefile.cli
-[ "$(echo '<?=php_sapi_name();' | ./sapi/cli/php -n)" = cli ] || exit 1
+[ "$(echo '<?=php_sapi_name();' | ./sapi/cli/php -n $test_args)" = cli ] || exit 1
 
 # FCGI
 %if %{with fcgi}
@@ -1958,7 +1959,7 @@
 rm -rf sapi/cgi/.libs sapi/cgi/*.lo
 %{__make} sapi/cgi/php-cgi -f Makefile.fcgi
 cp -r sapi/cgi sapi/fcgi
-[ "$(echo '<?=php_sapi_name();' | ./sapi/fcgi/php-cgi -qn)" = cgi-fcgi ] || exit 1
+[ "$(echo '<?=php_sapi_name();' | ./sapi/fcgi/php-cgi -qn $test_args)" = cgi-fcgi ] || exit 1
 %endif
 
 %if %{with fpm}
@@ -1966,7 +1967,7 @@
 rm -rf sapi/cgi/.libs sapi/cgi/*.lo
 %{__make} sapi/cgi/php-cgi -f Makefile.fpm
 cp -r sapi/cgi sapi/fpm
-[ "$(echo '<?=php_sapi_name();' | ./sapi/fpm/php-cgi -qn)" = cgi-fcgi ] || exit 1
+[ "$(echo '<?=php_sapi_name();' | ./sapi/fpm/php-cgi -qn $test_args)" = cgi-fcgi ] || exit 1
 %endif
 
 %if %{with tests}
@@ -2780,10 +2781,6 @@
 %attr(755,root,root) %{php_extensiondir}/recode.so
 %endif
 
-%if 0
-# simplexml is needed by spl, and spl can't be built shared as of now (5.2.0)
-# simplexml can be built shared, but SPL startup fails
-# we could add R: -simplexml to -common...
 %files simplexml
 %defattr(644,root,root,755)
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/simplexml.ini
@@ -2916,6 +2913,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.805.2.15  2009/09/23 10:40:04  glen
+- build simplexml as shared
+
 Revision 1.805.2.14  2009/09/23 07:26:53  glen
 - build session as shared; rel 3
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/php/php.spec?r1=1.805.2.14&r2=1.805.2.15&f=u