projects / packages / php.git / blame
| 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) |
| 6a6d595f ER |
15 | --- php-5.3.2/Makefile.global 2010-03-16 16:31:36.972576955 +0200 |
| 16 | +++ php-5.4.35/Makefile.global 2015-01-21 15:07:46.782561411 +0200 | |
| c0240cb1 | 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' | |
| 6a6d595f | 23 | +PHP_TEST_SHARED_SYSTEM_EXTENSIONS = |
| c0240cb1 | 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 | ||
| 6a6d595f ER |
40 | @@ -96,7 +103,7 @@ |
| 41 | PHP_DEPRECATED_DIRECTIVES_REGEX = '^(magic_quotes_(gpc|runtime|sybase)?|(zend_)?extension(_debug)?(_ts)?)[\t\ ]*=' | |
| 42 | ||
| 43 | test: all | |
| 44 | - -@if test ! -z "$(PHP_EXECUTABLE)" && test -x "$(PHP_EXECUTABLE)"; then \ | |
| 45 | + @if test ! -z "$(PHP_EXECUTABLE)" && test -x "$(PHP_EXECUTABLE)"; then \ | |
| 46 | INI_FILE=`$(PHP_EXECUTABLE) -d 'display_errors=stderr' -r 'echo php_ini_loaded_file();' 2> /dev/null`; \ | |
| 47 | if test "$$INI_FILE"; then \ | |
| 48 | $(EGREP) -h -v $(PHP_DEPRECATED_DIRECTIVES_REGEX) "$$INI_FILE" > $(top_builddir)/tmp-php.ini; \ | |
| 49 | @@ -107,7 +114,10 @@ | |
| c0240cb1 | 50 | TEST_PHP_EXECUTABLE=$(PHP_EXECUTABLE) \ |
| 51 | TEST_PHP_SRCDIR=$(top_srcdir) \ | |
| 52 | CC="$(CC)" \ | |
| 53 | - $(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); \ | |
| 54 | + $(PHP_EXECUTABLE) -n -c $(top_builddir)/tmp-php.ini \ | |
| 55 | + -d extension_dir=$(top_builddir)/modules/ -d 'extension=$(EXTENSION_DIR)/pcre.$(SHLIB_DL_SUFFIX_NAME)' \ | |
| 56 | + $(PHP_TEST_SETTINGS) $(top_srcdir)/run-tests.php -n -c $(top_builddir)/tmp-php.ini \ | |
| 57 | + -d extension_dir=$(top_builddir)/modules/ $(PHP_TEST_SHARED_EXTENSIONS) $(RUN_TESTS_SETTINGS) $(TESTS); \ | |
| 58 | rm $(top_builddir)/tmp-php.ini; \ | |
| 59 | else \ | |
| 60 | echo "ERROR: Cannot run tests without CLI sapi."; \ |