packages: php/fix-test-run.patch, php/php.spec - tests: load PHP_TEST_SHARE...

glen glen at pld-linux.org
Fri Oct 14 08:05:07 CEST 2011


Author: glen                         Date: Fri Oct 14 06:05:07 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- tests: load PHP_TEST_SHARED_SYSTEM_EXTENSIONS before extension modules

---- Files affected:
packages/php:
   fix-test-run.patch (1.9 -> 1.10) , php.spec (1.958 -> 1.959) 

---- Diffs:

================================================================
Index: packages/php/fix-test-run.patch
diff -u packages/php/fix-test-run.patch:1.9 packages/php/fix-test-run.patch:1.10
--- packages/php/fix-test-run.patch:1.9	Sun Dec 12 22:00:01 2010
+++ packages/php/fix-test-run.patch	Fri Oct 14 08:05:01 2011
@@ -12,32 +12,26 @@
  PHP_SUBST(PHP_MODULES)
  PHP_SUBST(PHP_ZEND_EX)
  
---- php-5.3.4/Makefile.global~	2010-12-12 23:08:32.000000000 +0200
-+++ php-5.3.4/Makefile.global	2010-12-12 23:09:31.246644108 +0200
-@@ -77,7 +77,8 @@
+--- php-5.3.8/Makefile.global~	2011-10-14 08:58:00.288329595 +0300
++++ php-5.3.8/Makefile.global	2011-10-14 08:50:16.670234576 +0300
+@@ -77,8 +77,15 @@
  		done; \
  	fi
  
 -PHP_TEST_SETTINGS = -d 'open_basedir=' -d 'output_buffering=0' -d 'memory_limit=-1'
 +PHP_TEST_SETTINGS = -d 'open_basedir=' -d 'output_buffering=0' -d 'memory_limit=-1' -d 'safe_mode=0'
-+PHP_TEST_SHARED_SYSTEM_EXTENSIONS = pcre
++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\ ]*='
- 
-@@ -114,7 +114,10 @@
++	fi; \
+ 	if test "x$(PHP_MODULES)" != "x"; then \
+ 		for i in $(PHP_MODULES)""; do \
+ 			. $$i; $(top_srcdir)/build/shtool echo -n -- " -d extension=$$dlname"; \
+@@ -107,7 +114,10 @@
  		TEST_PHP_EXECUTABLE=$(PHP_EXECUTABLE) \
  		TEST_PHP_SRCDIR=$(top_srcdir) \
  		CC="$(CC)" \
@@ -49,14 +43,3 @@
  		rm $(top_builddir)/tmp-php.ini; \
  	else \
  		echo "ERROR: Cannot run tests without CLI sapi."; \
---- php-5.3.2/Makefile.global	2010-03-16 16:31:36.972576955 +0200
-+++ php-5.3.2/Makefile.global	2010-03-16 16:31:36.972576955 +0200
-@@ -296,7 +296,7 @@
- 	fi
- 
- PHP_TEST_SETTINGS = -d 'open_basedir=' -d 'output_buffering=0' -d 'memory_limit=-1' -d 'safe_mode=0'
--PHP_TEST_SHARED_SYSTEM_EXTENSIONS = pcre
-+PHP_TEST_SHARED_SYSTEM_EXTENSIONS =
- PHP_TEST_SHARED_EXTENSIONS =  ` \
- 	if test "x$(PHP_MODULES)" != "x"; then \
- 		for i in $(PHP_MODULES)""; do \

================================================================
Index: packages/php/php.spec
diff -u packages/php/php.spec:1.958 packages/php/php.spec:1.959
--- packages/php/php.spec:1.958	Sun Oct  9 12:25:25 2011
+++ packages/php/php.spec	Fri Oct 14 08:05:01 2011
@@ -110,7 +110,7 @@
 %undefine	with_filter
 %endif
 
-%define		rel	7
+%define		rel	8
 Summary:	PHP: Hypertext Preprocessor
 Summary(fr.UTF-8):	Le langage de script embarque-HTML PHP
 Summary(pl.UTF-8):	Język skryptowy PHP
@@ -3220,6 +3220,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.959  2011/10/14 06:05:01  glen
+- tests: load PHP_TEST_SHARED_SYSTEM_EXTENSIONS before extension modules
+
 Revision 1.958  2011/10/09 10:25:25  arekm
 - release 7
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/php/fix-test-run.patch?r1=1.9&r2=1.10&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/php/php.spec?r1=1.958&r2=1.959&f=u



More information about the pld-cvs-commit mailing list