]>
Commit | Line | Data |
---|---|---|
02d2dcbb ER |
1 | --- php-5.4.0alpha2/configure.in~ 2011-08-07 12:43:31.000000000 +0300 |
2 | +++ php-5.4.0alpha2/configure.in 2011-08-07 12:44:11.495394662 +0300 | |
3 | @@ -1271,6 +1271,11 @@ | |
4 | ;; | |
5 | esac | |
c0240cb1 | 6 | |
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,') | |
11 | + | |
02d2dcbb | 12 | PHP_SUBST_OLD(PHP_INSTALLED_SAPIS) |
c0240cb1 | 13 | |
02d2dcbb | 14 | PHP_SUBST(PHP_EXECUTABLE) |
c0240cb1 | 15 | --- php-5.3.4/Makefile.global~ 2010-12-12 23:08:32.000000000 +0200 |
16 | +++ php-5.3.4/Makefile.global 2010-12-12 23:09:31.246644108 +0200 | |
17 | @@ -77,7 +77,8 @@ | |
18 | done; \ | |
19 | fi | |
20 | ||
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 \ | |
27 | @@ -88,6 +89,12 @@ | |
28 | for i in $(PHP_ZEND_EX)""; do \ | |
29 | . $$i; $(top_srcdir)/build/shtool echo -n -- " -d $(ZEND_EXT_TYPE)=$(top_builddir)/modules/$$dlname"; \ | |
30 | done; \ | |
31 | + fi; \ | |
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"; \ | |
36 | + done; \ | |
37 | fi` | |
38 | PHP_DEPRECATED_DIRECTIVES_REGEX = '^(define_syslog_variables|register_(globals|long_arrays)?|safe_mode|magic_quotes_(gpc|runtime|sybase)?|(zend_)?extension(_debug)?(_ts)?)[\t\ ]*=' | |
39 | ||
40 | @@ -114,7 +114,10 @@ | |
41 | TEST_PHP_EXECUTABLE=$(PHP_EXECUTABLE) \ | |
42 | TEST_PHP_SRCDIR=$(top_srcdir) \ | |
43 | CC="$(CC)" \ | |
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); \ | |
49 | rm $(top_builddir)/tmp-php.ini; \ | |
50 | else \ | |
51 | 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 | |
54 | @@ -296,7 +296,7 @@ | |
55 | fi | |
56 | ||
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 \ |