1 --- php-5.3.2/configure.in~ 2010-03-16 12:16:56.000000000 +0200
2 +++ php-5.3.2/configure.in 2010-03-16 16:13:24.926435546 +0200
4 PHP_SUBST(PHP_CLI_OBJS)
5 PHP_SUBST(PHP_GLOBAL_OBJS)
7 +# shift so that pcre, spl, ... are loaded first
8 +PHP_MODULES=$(echo "$PHP_MODULES" | sed -e 's,\(.*\)\(\$(phplibdir)/xml.la \),\2\1,')
9 +PHP_MODULES=$(echo "$PHP_MODULES" | sed -e 's,\(.*\)\(\$(phplibdir)/spl.la \),\2\1,')
10 +PHP_MODULES=$(echo "$PHP_MODULES" | sed -e 's,\(.*\)\(\$(phplibdir)/pcre.la \),\2\1,')
12 PHP_SUBST(PHP_MODULES)
13 PHP_SUBST(PHP_ZEND_EX)
15 --- php-5.3.2/Makefile.global 2010-03-16 16:31:36.972576955 +0200
16 +++ php-5.3.2/Makefile.global 2010-03-16 16:31:36.972576955 +0200
21 -PHP_TEST_SETTINGS = -d 'open_basedir=' -d 'output_buffering=0' -d 'memory_limit=-1'
22 +PHP_TEST_SETTINGS = -d 'open_basedir=' -d 'output_buffering=0' -d 'memory_limit=-1' -d 'safe_mode=0'
23 +PHP_TEST_SHARED_SYSTEM_EXTENSIONS = pcre
24 PHP_TEST_SHARED_EXTENSIONS = ` \
25 if test "x$(PHP_MODULES)" != "x"; then \
26 for i in $(PHP_MODULES)""; do \
28 for i in $(PHP_ZEND_EX)""; do \
29 . $$i; $(top_srcdir)/build/shtool echo -n -- " -d $(ZEND_EXT_TYPE)=$(top_builddir)/modules/$$dlname"; \
32 + if test "x$(PHP_TEST_SHARED_SYSTEM_EXTENSIONS)" != "x"; then \
33 + for i in $(PHP_TEST_SHARED_SYSTEM_EXTENSIONS)""; do \
34 + dlname=$$i.$(SHLIB_DL_SUFFIX_NAME); \
35 + $(top_srcdir)/build/shtool echo -n -- " -d extension=$(EXTENSION_DIR)/$$dlname"; \
38 PHP_DEPRECATED_DIRECTIVES_REGEX = '^(define_syslog_variables|register_(globals|long_arrays)?|safe_mode|magic_quotes_(gpc|runtime|sybase)?|(zend_)?extension(_debug)?(_ts)?)[\t\ ]*='
41 TEST_PHP_EXECUTABLE=$(PHP_EXECUTABLE) \
42 TEST_PHP_SRCDIR=$(top_srcdir) \
44 - $(PHP_EXECUTABLE) -n -c $(top_builddir)/tmp-php.ini $(PHP_TEST_SETTINGS) $(top_srcdir)/run-tests.php -n -c $(top_builddir)/tmp-php.ini -d extension_dir=$(top_builddir)/modules/ $(PHP_TEST_SHARED_EXTENSIONS) $(TESTS); \
45 + $(PHP_EXECUTABLE) -n -c $(top_builddir)/tmp-php.ini \
46 + -d extension_dir=$(top_builddir)/modules/ -d 'extension=$(EXTENSION_DIR)/pcre.$(SHLIB_DL_SUFFIX_NAME)' \
47 + $(PHP_TEST_SETTINGS) $(top_srcdir)/run-tests.php -n -c $(top_builddir)/tmp-php.ini \
48 + -d extension_dir=$(top_builddir)/modules/ $(PHP_TEST_SHARED_EXTENSIONS) $(RUN_TESTS_SETTINGS) $(TESTS); \
50 echo "ERROR: Cannot run tests without CLI sapi."; \
52 --- php-5.3.2/Makefile.global 2010-03-16 16:31:36.972576955 +0200
53 +++ php-5.3.2/Makefile.global 2010-03-16 16:31:36.972576955 +0200
57 PHP_TEST_SETTINGS = -d 'open_basedir=' -d 'output_buffering=0' -d 'memory_limit=-1' -d 'safe_mode=0'
58 -PHP_TEST_SHARED_SYSTEM_EXTENSIONS = pcre
59 +PHP_TEST_SHARED_SYSTEM_EXTENSIONS =
60 PHP_TEST_SHARED_EXTENSIONS = ` \
61 if test "x$(PHP_MODULES)" != "x"; then \
62 for i in $(PHP_MODULES)""; do \
63 --- php-5.3.2/Makefile.gcov 2010-03-16 16:31:36.972576955 +0200
64 +++ php-5.3.2/Makefile.gcov 2010-03-16 16:31:36.972576955 +0200
66 @echo "Running test suite"
67 @find . -name \*.gcda -o -name \*.da -o -name \*.bbg? | xargs rm -f
68 -@if test ! -z "$(PHP_EXECUTABLE)" && test -x "$(PHP_EXECUTABLE)"; then \
69 + INI_FILE=`$(PHP_EXECUTABLE) -d 'display_errors=stderr' -r 'echo php_ini_loaded_file();' 2> /dev/null`; \
70 + if test "$$INI_FILE"; then \
71 + $(EGREP) -h -v $(PHP_DEPRECATED_DIRECTIVES_REGEX) "$$INI_FILE" > $(top_builddir)/tmp-php.ini; \
73 + echo > $(top_builddir)/tmp-php.ini; \
75 + INI_SCANNED_PATH=`$(PHP_EXECUTABLE) -d 'display_errors=stderr' -r '$$a = explode(",\n", trim(php_ini_scanned_files())); echo $$a[0];' 2> /dev/null`; \
76 + if test "$$INI_SCANNED_PATH"; then \
77 + INI_SCANNED_PATH=`$(top_srcdir)/build/shtool path -d $$INI_SCANNED_PATH`; \
78 + $(EGREP) -h -v $(PHP_DEPRECATED_DIRECTIVES_REGEX) "$$INI_SCANNED_PATH"/*.ini >> $(top_builddir)/tmp-php.ini; \
81 TEST_PHP_EXECUTABLE=$(PHP_EXECUTABLE) \
82 TEST_PHP_SRCDIR=$(top_srcdir) \
84 - $(PHP_EXECUTABLE) -d 'open_basedir=' -d 'safe_mode=0' -d 'output_buffering=0' -d 'memory_limit=-1' $(top_srcdir)/run-tests.php -d 'extension_dir=modules/' -d `( . $(PHP_MODULES) ; echo extension=$$dlname)` tests/; \
85 + $(PHP_EXECUTABLE) -n -c $(top_builddir)/tmp-php.ini \
86 + -d extension_dir=$(top_builddir)/modules/ -d 'extension=$(EXTENSION_DIR)/pcre.$(SHLIB_DL_SUFFIX_NAME)' \
87 + $(PHP_TEST_SETTINGS) $(top_srcdir)/run-tests.php -n -c $(top_builddir)/tmp-php.ini \
88 + -d extension_dir=$(top_builddir)/modules/ $(PHP_TEST_SHARED_EXTENSIONS) $(RUN_TESTS_SETTINGS) $(TESTS); \
89 elif test ! -z "$(SAPI_CLI_PATH)" && test -x "$(SAPI_CLI_PATH)"; then \
91 TEST_PHP_EXECUTABLE=$(top_builddir)/$(SAPI_CLI_PATH) \