packages: php/php.spec - with --enable-zend-multibyte mbstring needs to be ...

[glen]

Author: glen                         Date: Thu Jun 25 18:15:39 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- with --enable-zend-multibyte mbstring needs to be linked static:
  Cannot load /etc/apache/modules/libphp5.so into server: /etc/apache/modules/libphp5.so: undefined symbol: php_mb_set_zend_encoding
  so disable it again (and add bcond)

---- Files affected:
packages/php:
   php.spec (1.799 -> 1.800) 

---- Diffs:

================================================================
Index: packages/php/php.spec
diff -u packages/php/php.spec:1.799 packages/php/php.spec:1.800
--- packages/php/php.spec:1.799	Mon Jun 22 02:28:55 2009
+++ packages/php/php.spec	Thu Jun 25 20:15:33 2009
@@ -20,6 +20,7 @@
 %bcond_with	oci8		# with Oracle oci8 extension module	(BR: proprietary libs)
 %bcond_with	system_gd	# with system gd (we prefer internal since it enables few more features)
 %bcond_with	gd_jis_conv	# causes imagettfbbox(): any2eucjp(): invalid code in input string when internal gd used
+%bcond_with	zend_multibyte		# enable zend multibyte, mbstring can't be shared then anymore
 %bcond_without	curl		# without CURL extension module
 %bcond_without	filter		# without filter extension module
 %bcond_without	imap		# without IMAP extension module
@@ -419,6 +420,7 @@
 Requires:	php-dirs
 Provides:	php(date)
 Provides:	php(libxml)
+%{?with_zend_multibyte:Provides:	php(mbstring)}
 Provides:	php(modules_api) = %{php_api_version}
 Provides:	php(overload)
 %{?with_pcre:Provides:	php(pcre)}
@@ -429,7 +431,8 @@
 Provides:	php(standard)
 Provides:	php(zend_extension_api) = %{zend_extension_api}
 Provides:	php(zend_module_api) = %{zend_module_api}
-%{?with_pcre:Provides:	php-pcre}
+%{?with_zend_multibyte:Provides:	php-mbstring = %{epoch}:%{version}-%{release}}
+%{?with_pcre:Provides:	php-pcre = %{epoch}:%{version}-%{release}}
 Provides:	php5(debug) = %{php_debug}
 Provides:	php5(thread-safety) = %{zend_zts}
 Obsoletes:	php-pcre < 4:5.2.0
@@ -1784,7 +1787,7 @@
 	--%{!?debug:dis}%{?debug:en}able-debug \
 	%{?with_zts:--enable-maintainer-zts} \
 	%{?with_suhosin:--enable-suhosin} \
-	--enable-zend-multibyte \
+	%{?with_zend_multibyte:--enable-zend-multibyte} \
 	--enable-inline-optimization \
 	--enable-bcmath=shared \
 	--enable-calendar=shared \
@@ -1797,7 +1800,7 @@
 	%{?with_gd_jis_conv:--enable-gd-jis-conv} \
 	--enable-libxml \
 	--enable-magic-quotes \
-	--enable-mbstring=shared,all \
+	--enable-mbstring=%{?!with_zend_multibyte:shared,}all \
 	--enable-mbregex \
 	--enable-pcntl=shared \
 	--enable-pdo=shared \
@@ -2581,10 +2584,12 @@
 %attr(755,root,root) %{php_extensiondir}/ldap.so
 %endif
 
+%if %{without zend_multibyte}
 %files mbstring
 %defattr(644,root,root,755)
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/mbstring.ini
 %attr(755,root,root) %{php_extensiondir}/mbstring.so
+%endif
 
 %files mcrypt
 %defattr(644,root,root,755)
@@ -2875,6 +2880,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.800  2009/06/25 18:15:33  glen
+- with --enable-zend-multibyte mbstring needs to be linked static:
+  Cannot load /etc/apache/modules/libphp5.so into server: /etc/apache/modules/libphp5.so: undefined symbol: php_mb_set_zend_encoding
+  so disable it again (and add bcond)
+
 Revision 1.799  2009/06/22 00:28:55  glen
 - enable zend-multibyte (see also http://bugs.php.net/bug.php?id=22108); rel 3
 
================================================================

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