commit cec9dd8a0a002306409dfd90b3720234bf4c758c
Author: Jakub Bogusz <[email protected]>
Date: Thu Oct 22 20:32:28 2020 +0200
- hack flex scanners to avoid colliding global symbol
- drop non-existing --enable-suhosin option
- rel 35
php.spec | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
---
diff --git a/php.spec b/php.spec
index 462ac82..d8e7a7e 100644
--- a/php.spec
+++ b/php.spec
@@ -112,7 +112,7 @@ ERROR: You need to select at least one Apache SAPI to build
shared modules.
%define magic_mime /usr/share/misc/magic.mime
%endif
-%define rel 34
+%define rel 35
%define orgname php
%define ver_suffix 52
%define php_suffix %{!?with_default_php:%{ver_suffix}}
@@ -2023,6 +2023,9 @@ mv sapi/cli/tests/022.phpt{,.broken}
sh -xe %{_sourcedir}/skip-tests.sh
+# make colliding symbol static
+%{__sed} -i -e 's/^char \*yytext/static &/' Zend/zend_{ini,language}_scanner.c
+
%build
API=$(awk '/#define PHP_API_VERSION/{print $3}' main/php.h)
if [ $API != %{php_api_version} ]; then
@@ -2111,7 +2114,6 @@ for sapi in $sapis; do
--with-system-tzdata \
--%{!?debug:dis}%{?debug:en}able-debug \
%{?with_zts:--enable-maintainer-zts} \
- %{?with_suhosin:--enable-suhosin} \
%{?with_zend_multibyte:--enable-zend-multibyte} \
--enable-inline-optimization \
--enable-bcmath=shared \
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/php.git/commitdiff/cec9dd8a0a002306409dfd90b3720234bf4c758c
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
