[packages/php] fix-test-run.patch: set PHP_TEST_SHARED_SYSTEM_EXTENSIONS before tested module

glen glen at pld-linux.org
Sun Apr 27 14:30:13 CEST 2014


commit ff353fa7ad6c6feea3610add6b8e2df3a72af1dd
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Sun Apr 27 15:10:34 2014 +0300

    fix-test-run.patch: set PHP_TEST_SHARED_SYSTEM_EXTENSIONS before tested module

 fix-test-run.patch | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)
---
diff --git a/fix-test-run.patch b/fix-test-run.patch
index feb4cb4..42afec5 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.5.11.pre/Makefile.global	2014-04-27 15:04:43.224682666 +0300
-+++ php-5.5.11/Makefile.global	2014-04-27 15:05:38.963814051 +0300
-@@ -81,7 +81,8 @@
+--- php-5.5.11/Makefile.global	2014-04-27 15:05:38.963814051 +0300
++++ php-5.5.11/Makefile.global	2014-04-27 15:09:54.438443707 +0300
+@@ -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 \
-@@ -92,6 +93,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 = '^(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"; \
 @@ -111,7 +118,10 @@
  		TEST_PHP_EXECUTABLE=$(PHP_EXECUTABLE) \
  		TEST_PHP_SRCDIR=$(top_srcdir) \
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/php.git/commitdiff/ff353fa7ad6c6feea3610add6b8e2df3a72af1dd



More information about the pld-cvs-commit mailing list