projects / packages / php.git / blame
| Commit | Line | Data |
|---|---|---|
| 5c8bd0f5 ER |
1 | --- php-5.4.0alpha2/configure.ac~ 2011-08-07 12:43:31.000000000 +0300 |
| 2 | +++ php-5.4.0alpha2/configure.ac 2011-08-07 12:44:11.495394662 +0300 | |
| 02d2dcbb ER |
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) |
| f7323448 ER |
15 | --- php-5.5.11/build/Makefile.global 2014-04-27 15:05:38.963814051 +0300 |
| 16 | +++ php-5.5.11/build/Makefile.global 2014-04-27 15:09:54.438443707 +0300 | |
| ff353fa7 | 17 | @@ -81,8 +81,15 @@ |
| c0240cb1 | 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' | |
| 5dd69fe1 | 23 | +PHP_TEST_SHARED_SYSTEM_EXTENSIONS = |
| c0240cb1 | 24 | PHP_TEST_SHARED_EXTENSIONS = ` \ |
| c0240cb1 | 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; \ | |
| ff353fa7 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"; \ | |
| 5dd69fe1 | 34 | @@ -111,7 +118,10 @@ |
| c0240cb1 | 35 | TEST_PHP_EXECUTABLE=$(PHP_EXECUTABLE) \ |
| 36 | TEST_PHP_SRCDIR=$(top_srcdir) \ | |
| 37 | CC="$(CC)" \ | |
| 38 | - $(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); \ | |
| 39 | + $(PHP_EXECUTABLE) -n -c $(top_builddir)/tmp-php.ini \ | |
| 40 | + -d extension_dir=$(top_builddir)/modules/ -d 'extension=$(EXTENSION_DIR)/pcre.$(SHLIB_DL_SUFFIX_NAME)' \ | |
| 41 | + $(PHP_TEST_SETTINGS) $(top_srcdir)/run-tests.php -n -c $(top_builddir)/tmp-php.ini \ | |
| 42 | + -d extension_dir=$(top_builddir)/modules/ $(PHP_TEST_SHARED_EXTENSIONS) $(RUN_TESTS_SETTINGS) $(TESTS); \ | |
| 153a312d | 43 | TEST_RESULT_EXIT_CODE=$$?; \ |
| c0240cb1 | 44 | rm $(top_builddir)/tmp-php.ini; \ |
| 153a312d | 45 | exit $$TEST_RESULT_EXIT_CODE; \ |