From: Elan Ruusamäe <glen@delfi.ee>
Date: Wed, 23 Nov 2016 02:55:32 +0000 (+0200)
Subject: backport fix-test-run.patch from php 5.5 branch
X-Git-Tag: auto/th/php54-5.4.45-12
X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=commitdiff_plain;h=cf8fc50e9ad6cf00657a57b3ee7b44b4c0396925;p=packages%2Fphp.git

backport fix-test-run.patch from php 5.5 branch
---

diff --git a/fix-test-run.patch b/fix-test-run.patch
index 86a172c..8bddab2 100644
--- a/fix-test-run.patch
+++ b/fix-test-run.patch
@@ -12,9 +12,9 @@
  PHP_SUBST_OLD(PHP_INSTALLED_SAPIS)
  
  PHP_SUBST(PHP_EXECUTABLE)
---- php-5.3.2/Makefile.global	2010-03-16 16:31:36.972576955 +0200
-+++ php-5.4.35/Makefile.global	2015-01-21 15:07:46.782561411 +0200
-@@ -77,7 +77,8 @@
+--- php-5.4.35/Makefile.global	2015-01-21 15:07:46.782561411 +0200
++++ php-5.5.38/Makefile.global	2016-11-23 04:52:33.981224263 +0200
+@@ -81,8 +81,15 @@
  		done; \
  	fi
  
@@ -22,21 +22,15 @@
 +PHP_TEST_SETTINGS = -d 'open_basedir=' -d 'output_buffering=0' -d 'memory_limit=-1' -d 'safe_mode=0'
 +PHP_TEST_SHARED_SYSTEM_EXTENSIONS =
  PHP_TEST_SHARED_EXTENSIONS =  ` \
- 	if test "x$(PHP_MODULES)" != "x"; then \
- 		for i in $(PHP_MODULES)""; do \
-@@ -88,6 +89,12 @@
- 		for i in $(PHP_ZEND_EX)""; do \
- 			. $$i; $(top_srcdir)/build/shtool echo -n -- " -d $(ZEND_EXT_TYPE)=$(top_builddir)/modules/$$dlname"; \
- 		done; \
-+	fi; \
 +	if test "x$(PHP_TEST_SHARED_SYSTEM_EXTENSIONS)" != "x"; then \
 +		for i in $(PHP_TEST_SHARED_SYSTEM_EXTENSIONS)""; do \
 +			dlname=$$i.$(SHLIB_DL_SUFFIX_NAME); \
 +			$(top_srcdir)/build/shtool echo -n -- " -d extension=$(EXTENSION_DIR)/$$dlname"; \
 +		done; \
- 	fi`
- PHP_DEPRECATED_DIRECTIVES_REGEX = '^(define_syslog_variables|register_(globals|long_arrays)?|safe_mode|magic_quotes_(gpc|runtime|sybase)?|(zend_)?extension(_debug)?(_ts)?)[\t\ ]*='
- 
++	fi; \
+ 	if test "x$(PHP_MODULES)" != "x"; then \
+ 		for i in $(PHP_MODULES)""; do \
+ 			. $$i; $(top_srcdir)/build/shtool echo -n -- " -d extension=$$dlname"; \
 @@ -96,7 +103,7 @@
  PHP_DEPRECATED_DIRECTIVES_REGEX = '^(magic_quotes_(gpc|runtime|sybase)?|(zend_)?extension(_debug)?(_ts)?)[\t\ ]*='
  
diff --git a/php.spec b/php.spec
index 98dcfee..53ae6f7 100644
--- a/php.spec
+++ b/php.spec
@@ -124,7 +124,7 @@ ERROR: You need to select at least one Apache SAPI to build shared modules.
 %undefine	with_filter
 %endif
 
-%define		rel	11
+%define		rel	12
 %define		orgname	php
 %define		ver_suffix 54
 %define		php_suffix %{!?with_default_php:%{ver_suffix}}