svn: /php/php-src/ branches/PHP_5_3/Makefile.global trunk/Makefile.global
| From: | Jani Taskinen | Date: | Fri, 24 Jul 2009 20:24:12 +0000 |
| Subject: | svn: /php/php-src/ branches/PHP_5_3/Makefile.global trunk/Makefile.global | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-59769@lists.php.net to get a copy of this message | ||
jani Fri, 24 Jul 2009 20:24:12 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=284719
Log:
- Fixed bug #48835 (Deprecated php.ini options in old php.inis makes "make test" to fail)
Bug: http://bugs.php.net/48835 (Assigned) Deprecated php.ini
options in old php.ini's makes "make test" to fail
Changed paths:
U php/php-src/branches/PHP_5_3/Makefile.global
U php/php-src/trunk/Makefile.global
Modified: php/php-src/branches/PHP_5_3/Makefile.global
===================================================================
--- php/php-src/branches/PHP_5_3/Makefile.global 2009-07-24 19:51:55 UTC (rev 284718)
+++ php/php-src/branches/PHP_5_3/Makefile.global 2009-07-24 20:24:12 UTC (rev 284719)
@@ -89,14 +89,14 @@
elif test ! -z "$(SAPI_CLI_PATH)" && test -x "$(SAPI_CLI_PATH)"; then
\
INI_FILE=
$(top_builddir)/$(SAPI_CLI_PATH) -d 'display_errors=stderr' -r
'echo php_ini_loaded_file();' 2> /dev/null; \
if test "$$INI_FILE"; then \
- $(EGREP) -v '^(zend_)?extension(_debug)?(_ts)?[\t\ ]*=' "$$INI_FILE" >
$(top_builddir)/tmp-php.ini; \
+ $(EGREP) -v '^(magic_quotes_(gpc|runtime|sybase)?|(zend_)?extension(_debug)?(_ts)?)[\t\
]*=' "$$INI_FILE" > $(top_builddir)/tmp-php.ini; \
else \
echo > $(top_builddir)/tmp-php.ini; \
fi; \
INI_SCANNED_PATH=$(top_builddir)/$(SAPI_CLI_PATH) -d 'display_errors=stderr' -r
'$$a = explode(",\n", trim(php_ini_scanned_files())); echo $$a[0];' 2>
/dev/null; \
if test "$$INI_SCANNED_PATH"; then \
INI_SCANNED_PATH=$(top_srcdir)/build/shtool path -d $$INI_SCANNED_PATH; \
- $(EGREP) -h -v '^(zend_)?extension(_debug)?(_ts)?[\t\ ]*='
"$$INI_SCANNED_PATH"/*.ini >> $(top_builddir)/tmp-php.ini; \
+ $(EGREP) -h -v '^(magic_quotes_(gpc|runtime|sybase)?|(zend_)?extension(_debug)?(_ts)?)[\t\
]*=' "$$INI_SCANNED_PATH"/*.ini >> $(top_builddir)/tmp-php.ini; \
fi; \
TEST_PHP_EXECUTABLE=$(top_builddir)/$(SAPI_CLI_PATH) \
TEST_PHP_SRCDIR=$(top_srcdir) \
@@ -115,7 +115,7 @@
rm -f libphp$(PHP_MAJOR_VERSION).la $(SAPI_CLI_PATH) $(OVERALL_TARGET) modules/* libs/*
distclean: clean
- rm -f Makefile config.cache config.log config.status Makefile.objects Makefile.fragments libtool
main/php_config.h stamp-h php5.spec sapi/apache/libphp$(PHP_MAJOR_VERSION).module buildmk.stamp
+ rm -f Makefile config.cache config.log config.status Makefile.objects Makefile.fragments libtool
main/php_config.h stamp-h sapi/apache/libphp$(PHP_MAJOR_VERSION).module buildmk.stamp
$(EGREP) define'.*include/php' $(top_srcdir)/configure | $(SED)
's/.*>//'|xargs rm -f
.PHONY: all clean install distclean test
Modified: php/php-src/trunk/Makefile.global
===================================================================
--- php/php-src/trunk/Makefile.global 2009-07-24 19:51:55 UTC (rev 284718)
+++ php/php-src/trunk/Makefile.global 2009-07-24 20:24:12 UTC (rev 284719)
@@ -89,14 +89,14 @@
elif test ! -z "$(SAPI_CLI_PATH)" && test -x "$(SAPI_CLI_PATH)"; then
\
INI_FILE=$(top_builddir)/$(SAPI_CLI_PATH) -d 'display_errors=stderr' -r
'echo php_ini_loaded_file();' 2> /dev/null; \
if test "$$INI_FILE"; then \
- $(EGREP) -v '^(zend_)?extension(_debug)?(_ts)?[\t\ ]*=' "$$INI_FILE" >
$(top_builddir)/tmp-php.ini; \
+ $(EGREP) -v '^(magic_quotes_(gpc|runtime|sybase)?|(zend_)?extension(_debug)?(_ts)?)[\t\
]*=' "$$INI_FILE" > $(top_builddir)/tmp-php.ini; \
else \
echo > $(top_builddir)/tmp-php.ini; \
fi; \
INI_SCANNED_PATH=$(top_builddir)/$(SAPI_CLI_PATH) -d 'display_errors=stderr' -r
'$$a = explode(",\n", trim(php_ini_scanned_files())); echo $$a[0];' 2>
/dev/null; \
if test "$$INI_SCANNED_PATH"; then \
INI_SCANNED_PATH=$(top_srcdir)/build/shtool path -d $$INI_SCANNED_PATH; \
- $(EGREP) -h -v '^(zend_)?extension(_debug)?(_ts)?[\t\ ]*='
"$$INI_SCANNED_PATH"/*.ini >> $(top_builddir)/tmp-php.ini; \
+ $(EGREP) -h -v '^(magic_quotes_(gpc|runtime|sybase)?|(zend_)?extension(_debug)?(_ts)?)[\t\
]*=' "$$INI_SCANNED_PATH"/*.ini >> $(top_builddir)/tmp-php.ini; \
fi; \
TEST_PHP_EXECUTABLE=$(top_builddir)/$(SAPI_CLI_PATH) \
TEST_PHP_SRCDIR=$(top_srcdir) \