commit a013a9dc8e5bb4c1df21481dafbdceae1ca79977
Author: Elan Ruusamäe <[email protected]>
Date: Mon Nov 23 13:44:30 2015 +0200
fix hash<>phar issues
cherry-picked c5579dea175b65dfb0b2f63361b7161234b3798d
dep-tests.sh | 2 +-
phar-hash-shared.patch | 11 +++++++++++
php.spec | 2 +-
3 files changed, 13 insertions(+), 2 deletions(-)
---
diff --git a/php.spec b/php.spec
index 482ca8e..b57c75d 100644
--- a/php.spec
+++ b/php.spec
@@ -150,7 +150,7 @@ ERROR: You need to select at least one Apache SAPI to build
shared modules.
%undefine with_filter
%endif
-%define rel 1
+%define rel 2
%define orgname php
%define ver_suffix 56
%define php_suffix %{!?with_default_php:%{ver_suffix}}
diff --git a/dep-tests.sh b/dep-tests.sh
index f28ab54..9abd19b 100755
--- a/dep-tests.sh
+++ b/dep-tests.sh
@@ -19,7 +19,7 @@ dep_pdo_dblib="$dep_pdo pdo"
dep_pdo_mysql="$dep_pdo pdo $with_mysqlnd"
dep_simplexml="$dep_spl spl"
dep_imap="pcre"
-dep_phar="$dep_spl spl"
+dep_phar="$dep_spl spl hash"
dep_sqlite="$dep_pdo pdo"
dep_fileinfo="pcre"
dep_wddx='xml'
diff --git a/phar-hash-shared.patch b/phar-hash-shared.patch
index 28119af..621fe6d 100644
--- a/phar-hash-shared.patch
+++ b/phar-hash-shared.patch
@@ -20,3 +20,14 @@
if test "$PHP_OPENSSL_SHARED" = "yes"; then
AC_MSG_RESULT([no (shared openssl)])
else
+--- php-7.0.0RC7/ext/phar/Makefile.frag~ 2015-11-23 11:06:31.000000000
+0200
++++ php-7.0.0RC7/ext/phar/Makefile.frag 2015-11-23 11:15:36.452443959
+0200
+@@ -9,7 +9,7 @@
+ $(top_srcdir)/build/shtool echo -n --
"$(top_builddir)/$(SAPI_CLI_PATH) -n"; \
+ if test "x$(PHP_MODULES)" != "x"; then \
+ $(top_srcdir)/build/shtool echo -n -- " -d
extension_dir=$(top_builddir)/modules"; \
+- for i in pcre spl bz2 zlib phar; do \
++ for i in pcre spl bz2 zlib hash phar; do \
+ if test -f "$(top_builddir)/modules/$$i.la"; then \
+ . $(top_builddir)/modules/$$i.la;
$(top_srcdir)/build/shtool echo -n -- " -d extension=$$dlname"; \
+ fi; \
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/php.git/commitdiff/a013a9dc8e5bb4c1df21481dafbdceae1ca79977
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
