Author: glen Date: Thu Dec 3 06:32:24 2009 GMT
Module: packages Tag: PHP_5_2
---- Log message:
- build config fragments in build section
---- Files affected:
packages/php:
php.spec (1.805.2.29 -> 1.805.2.30)
---- Diffs:
================================================================
Index: packages/php/php.spec
diff -u packages/php/php.spec:1.805.2.29 packages/php/php.spec:1.805.2.30
--- packages/php/php.spec:1.805.2.29 Wed Dec 2 23:37:03 2009
+++ packages/php/php.spec Thu Dec 3 07:32:17 2009
@@ -2002,13 +2002,6 @@
%{__make} sapi/cli/php -f Makefile.cli
[ "$(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}
cp -af php_config.h.fcgi main/php_config.h
@@ -2026,6 +2019,36 @@
[ "$(echo '<?=php_sapi_name();' | ./sapi/fpm/php-cgi -qn)" = cgi-fcgi ] ||
exit 1
%endif
+# Generate stub .ini files for each extension
+rm -rf conf.d
+install -d conf.d
+generate_inifiles() {
+ for so in modules/*.so; do
+ mod=$(basename $so .so)
+ conf="$mod.ini"
+ # xml needs to be loaded before wddx
+ [ "$mod" = "wddx" ] && conf="xml_$mod.ini"
+ # pre needs to be loaded before SPL
+ [ "$mod" = "pcre" ] && conf="PCRE.ini"
+ # spl needs to be loaded before mysqli
+ [ "$mod" = "spl" ] && conf="SPL.ini"
+ echo "+ $conf"
+ cat > conf.d/$conf <<-EOF
+ ; Enable $mod extension module
+ extension=$mod.so
+ EOF
+ done
+}
+generate_inifiles
+
+# Check that the module inner-dependencies are intact
+PHP=./sapi/cli/php EXTENSION_DIR=modules CONFDIR=conf.d ./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
+
+
%if %{with tests}
# Run tests, using the CLI SAPI
export NO_INTERACTION=1 REPORT_EXIT_STATUS=1 MALLOC_CHECK_=2
@@ -2106,26 +2129,8 @@
rm -f $RPM_BUILD_ROOT%{_libdir}/apache/libphp5.la
%endif
-# Generate stub .ini files for each subpackage
install -d $RPM_BUILD_ROOT%{_sysconfdir}/conf.d
-generate_inifiles() {
- for so in modules/*.so; do
- mod=$(basename $so .so)
- conf="%{_sysconfdir}/conf.d/$mod.ini"
- # xml needs to be loaded before wddx
- [ "$mod" = "wddx" ] && conf="%{_sysconfdir}/conf.d/xml_$mod.ini"
- # pre needs to be loaded before SPL
- [ "$mod" = "pcre" ] && conf="%{_sysconfdir}/conf.d/PCRE.ini"
- # spl needs to be loaded before mysqli
- [ "$mod" = "spl" ] && conf="%{_sysconfdir}/conf.d/SPL.ini"
- echo "+ $conf"
- cat > $RPM_BUILD_ROOT$conf <<-EOF
- ; Enable $mod extension module
- extension=$mod.so
- EOF
- done
-}
-generate_inifiles
+cp -a conf.d/*.ini $RPM_BUILD_ROOT%{_sysconfdir}/conf.d
# per SAPI ini directories
install -d
$RPM_BUILD_ROOT%{_sysconfdir}/{cgi,cli,cgi-fcgi,apache,apache2handler}.d
@@ -2999,6 +3004,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.805.2.30 2009/12/03 06:32:17 glen
+- build config fragments in build section
+
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)
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/php/php.spec?r1=1.805.2.29&r2=1.805.2.30&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
