packages (PHP_5_2): php/php.spec - core no longer needs to load simplexml.s...
glen
glen at pld-linux.org
Wed Dec 2 23:37:09 CET 2009
Author: glen Date: Wed Dec 2 22:37:09 2009 GMT
Module: packages Tag: PHP_5_2
---- Log message:
- core no longer needs to load simplexml.so for self-tests
- fix built sapis in php-config (fixes php-config --php-binary)
- sqlite ext has hard dependency on spl and pdo
- current wddx does not compile session related code due being built shared
- filter ext depends on pcre
- run internal module deps test
- rel 12
---- Files affected:
packages/php:
php.spec (1.805.2.28 -> 1.805.2.29)
---- Diffs:
================================================================
Index: packages/php/php.spec
diff -u packages/php/php.spec:1.805.2.28 packages/php/php.spec:1.805.2.29
--- packages/php/php.spec:1.805.2.28 Tue Dec 1 12:05:45 2009
+++ packages/php/php.spec Wed Dec 2 23:37:03 2009
@@ -1,5 +1,6 @@
# $Revision$, $Date$
# TODO
+# - wddx: restore session support (not compiled in due DL extension check)
# - fix -threads-acfix.patch
# - deal with modules removed from php and not moved to PECL, still not obsoleted anywhere
# - removed from php 5.0 (currently in php4):
@@ -111,7 +112,7 @@
Summary(uk.UTF-8): PHP Версії 5 - мова препроцесування HTML-файлів, виконувана на сервері
Name: php
Version: 5.2.11
-Release: 11
+Release: 12
Epoch: 4
License: PHP
Group: Libraries
@@ -130,6 +131,7 @@
Source10: %{name}-fpm.init
Source11: %{name}-fpm.logrotate
Source12: %{name}-branch.sh
+Source13: dep-tests.sh
Patch0: %{name}-shared.patch
Patch1: %{name}-pldlogo.patch
Patch2: %{name}-mail.patch
@@ -676,6 +678,7 @@
Summary(pl.UTF-8): Rozszerzenie do bezpiecznej obsługi danych wejściowych
Group: Libraries
Requires: %{name}-common = %{epoch}:%{version}-%{release}
+Requires: %{name}-pcre = %{epoch}:%{version}-%{release}
Provides: php(filter)
Obsoletes: php-pecl-filter
@@ -1395,8 +1398,8 @@
Summary(pl.UTF-8): Moduł SQLite dla PHP
Group: Libraries
Requires: %{name}-common = %{epoch}:%{version}-%{release}
-Suggests: %{name}-pdo = %{epoch}:%{version}-%{release}
-Suggests: %{name}-spl = %{epoch}:%{version}-%{release}
+Requires: %{name}-pdo = %{epoch}:%{version}-%{release}
+Requires: %{name}-spl = %{epoch}:%{version}-%{release}
Provides: php(sqlite)
%description sqlite
@@ -1532,7 +1535,10 @@
Summary(pl.UTF-8): Moduł wddx dla PHP
Group: Libraries
Requires: %{name}-common = %{epoch}:%{version}-%{release}
-Requires: %{name}-session = %{epoch}:%{version}-%{release}
+# - wddx doesn't require session as it's disabled at compile time:
+# if HAVE_PHP_SESSION && !defined(COMPILE_DL_SESSION)
+# see also php.spec#rev1.120.2.22
+#Requires: %{name}-session = %{epoch}:%{version}-%{release}
Requires: %{name}-xml = %{epoch}:%{version}-%{release}
Provides: php(wddx)
@@ -1772,6 +1778,7 @@
%endif
cp -af Zend/LICENSE{,.Zend}
+install -p %{SOURCE13} dep-tests.sh
%build
API=$(awk '/#define PHP_API_VERSION/{print $3}' main/php.h)
@@ -1968,6 +1975,10 @@
cp -f config.log config.log.$sapi
done
+# as we build each SAPI in own make, adjust php-config.in forehead
+sapis=$(awk '/^PHP_SAPI = /{print $3}' Makefile.* | sort -u | xargs)
+sed -i -e "s, at PHP_INSTALLED_SAPIS@,$sapis," "scripts/php-config.in"
+
# must make this first, so modules can link against it.
%{__make} libphp_common.la
%{__make} build-modules
@@ -1980,17 +1991,23 @@
%{__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 $test_args)" = cgi ] || exit 1
+[ "$(echo '<?=php_sapi_name();' | ./sapi/cgi/php-cgi -qn)" = 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 $test_args)" = cli ] || exit 1
+[ "$(echo '<?=php_sapi_name();' | ./sapi/cli/php -n)" = cli ] || exit 1
+
+# Check that the module inner-dependencies are intact
+PHP=./sapi/cli/php EXTENSION_DIR=modules ./dep-tests.sh > dep-tests.log
+if grep -v OK dep-tests.log; then
+ echo >&2 "The results above were not expected"
+ exit 1
+fi
# FCGI
%if %{with fcgi}
@@ -1998,7 +2015,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 $test_args)" = cgi-fcgi ] || exit 1
+[ "$(echo '<?=php_sapi_name();' | ./sapi/fcgi/php-cgi -qn)" = cgi-fcgi ] || exit 1
%endif
%if %{with fpm}
@@ -2006,7 +2023,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 $test_args)" = cgi-fcgi ] || exit 1
+[ "$(echo '<?=php_sapi_name();' | ./sapi/fpm/php-cgi -qn)" = cgi-fcgi ] || exit 1
%endif
%if %{with tests}
@@ -2982,6 +2999,15 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.805.2.29 2009/12/02 22:37:03 glen
+- core no longer needs to load simplexml.so for self-tests
+- fix built sapis in php-config (fixes php-config --php-binary)
+- sqlite ext has hard dependency on spl and pdo
+- current wddx does not compile session related code due being built shared
+- filter ext depends on pcre
+- run internal module deps test
+- rel 12
+
Revision 1.805.2.28 2009/12/01 11:05:45 glen
- uid http for fpm; rel 11
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/php/php.spec?r1=1.805.2.28&r2=1.805.2.29&f=u
More information about the pld-cvs-commit
mailing list