[packages/php/PHP_5_4] fixed php-fpm build check

glen glen at pld-linux.org
Tue Jul 31 22:27:21 CEST 2012


commit 3aeda88b33ca239f8fd60ab4625205d2efc8f394
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Tue Jul 31 23:27:18 2012 +0300

    fixed php-fpm build check

 php.spec | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)
---
diff --git a/php.spec b/php.spec
index 9855d50..8561024 100644
--- a/php.spec
+++ b/php.spec
@@ -2269,20 +2269,22 @@ cp -af Makefile.cli Makefile
 %if %{with cgi}
 cp -pf php_config.h.cgi-fcgi main/php_config.h
 %{__make} -f Makefile.cgi-fcgi
-[ "$(echo '<?=php_sapi_name();' | ./sapi/cgi/php-cgi -qn)" = cgi-fcgi ] || exit 1
+[ "$(echo '<?=php_sapi_name();' | ./sapi/cgi/php-cgi -qn)" = "cgi-fcgi" ]
 %endif
 
 # PHP FPM
 %if %{with fpm}
 cp -pf php_config.h.fpm main/php_config.h
 %{__make} -f Makefile.fpm
-#./sapi/fpm/php-fpm -qn -m > /dev/null
+./sapi/fpm/php-fpm -n -m
+[ $(./sapi/fpm/php-fpm -n -m | grep cgi-fcgi) = "cgi-fcgi" ]
+
 %endif
 
 # CLI
 cp -pf php_config.h.cli main/php_config.h
 %{__make} -f Makefile.cli
-[ "$(echo '<?=php_sapi_name();' | ./sapi/cli/php -qn)" = cli ] || exit 1
+[ "$(echo '<?=php_sapi_name();' | ./sapi/cli/php -qn)" = "cli" ]
 
 # check for stupid xml parse breakage where < and > just get lost in parse result
 ./sapi/cli/php -n -dextension_dir=modules -dextension=xml.so -r '$p = xml_parser_create(); xml_parse_into_struct($p, "<x><</x>", $vals, $index); exit((int )empty($vals[0]["value"]));'


More information about the pld-cvs-commit mailing list