]>
Commit | Line | Data |
---|---|---|
71f4af01 ER |
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 | |
3 | @@ -1224,6 +1224,11 @@ | |
4 | PHP_SUBST(PHP_CLI_OBJS) | |
5 | PHP_SUBST(PHP_GLOBAL_OBJS) | |
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 | + | |
12 | PHP_SUBST(PHP_MODULES) | |
13 | PHP_SUBST(PHP_ZEND_EX) | |
14 | ||
48d4a4bd ER |
15 | --- php-5.3.29/Makefile.global 2014-11-23 04:22:05.601031944 +0200 |
16 | +++ php-5.3.29/Makefile.global 2015-01-21 15:04:38.046113239 +0200 | |
57400dd2 | 17 | @@ -77,8 +77,15 @@ |
71f4af01 ER |
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' | |
57400dd2 | 23 | +PHP_TEST_SHARED_SYSTEM_EXTENSIONS = |
71f4af01 | 24 | PHP_TEST_SHARED_EXTENSIONS = ` \ |
2cc4a4cc ER |
25 | + if test "x$(PHP_TEST_SHARED_SYSTEM_EXTENSIONS)" != "x"; then \ |
26 | + for i in $(PHP_TEST_SHARED_SYSTEM_EXTENSIONS)""; do \ | |
27 | + dlname=$$i.$(SHLIB_DL_SUFFIX_NAME); \ | |
28 | + $(top_srcdir)/build/shtool echo -n -- " -d extension=$(EXTENSION_DIR)/$$dlname"; \ | |
29 | + done; \ | |
57400dd2 ER |
30 | + fi; \ |
31 | if test "x$(PHP_MODULES)" != "x"; then \ | |
32 | for i in $(PHP_MODULES)""; do \ | |
33 | . $$i; $(top_srcdir)/build/shtool echo -n -- " -d extension=$$dlname"; \ | |
48d4a4bd ER |
34 | @@ -92,7 +99,7 @@ |
35 | PHP_DEPRECATED_DIRECTIVES_REGEX = '^(define_syslog_variables|register_(globals|long_arrays)?|safe_mode|magic_quotes_(gpc|runtime|sybase)?|(zend_)?extension(_debug)?(_ts)?)[\t\ ]*=' | |
36 | ||
37 | test: all | |
38 | - -@if test ! -z "$(PHP_EXECUTABLE)" && test -x "$(PHP_EXECUTABLE)"; then \ | |
39 | + @if test ! -z "$(PHP_EXECUTABLE)" && test -x "$(PHP_EXECUTABLE)"; then \ | |
40 | INI_FILE=`$(PHP_EXECUTABLE) -d 'display_errors=stderr' -r 'echo php_ini_loaded_file();' 2> /dev/null`; \ | |
41 | if test "$$INI_FILE"; then \ | |
42 | $(EGREP) -h -v $(PHP_DEPRECATED_DIRECTIVES_REGEX) "$$INI_FILE" > $(top_builddir)/tmp-php.ini; \ | |
f1179e4f | 43 | @@ -107,7 +114,10 @@ |
71f4af01 ER |
44 | TEST_PHP_EXECUTABLE=$(PHP_EXECUTABLE) \ |
45 | TEST_PHP_SRCDIR=$(top_srcdir) \ | |
46 | CC="$(CC)" \ | |
47 | - $(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); \ | |
f1179e4f | 48 | + $(PHP_EXECUTABLE) -n -c $(top_builddir)/tmp-php.ini \ |
6c033b2c | 49 | + -d extension_dir=$(top_builddir)/modules/ -d 'extension=$(EXTENSION_DIR)/pcre.$(SHLIB_DL_SUFFIX_NAME)' \ |
17463f00 ER |
50 | + $(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) \ |
51 | + $(RUN_TESTS_SETTINGS) $(TESTS); \ | |
52 | TEST_RESULT_EXIT_CODE=$$?; \ | |
4e8b2de4 | 53 | rm $(top_builddir)/tmp-php.ini; \ |
17463f00 | 54 | exit $$TEST_RESULT_EXIT_CODE; \ |