projects / packages / php.git / blame
| 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 | ||
| f1179e4f ER |
15 | --- php-5.3.29/Makefile.global 2014-08-19 17:47:47.112627301 +0300 |
| 16 | +++ php-5.3.29/Makefile.global 2014-11-23 04:22:05.601031944 +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"; \ | |
| f1179e4f | 34 | @@ -107,7 +114,10 @@ |
| 71f4af01 ER |
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); \ | |
| f1179e4f | 39 | + $(PHP_EXECUTABLE) -n -c $(top_builddir)/tmp-php.ini \ |
| 6c033b2c | 40 | + -d extension_dir=$(top_builddir)/modules/ -d 'extension=$(EXTENSION_DIR)/pcre.$(SHLIB_DL_SUFFIX_NAME)' \ |
| 17463f00 ER |
41 | + $(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) \ |
| 42 | + $(RUN_TESTS_SETTINGS) $(TESTS); \ | |
| 43 | TEST_RESULT_EXIT_CODE=$$?; \ | |
| 4e8b2de4 | 44 | rm $(top_builddir)/tmp-php.ini; \ |
| 17463f00 | 45 | exit $$TEST_RESULT_EXIT_CODE; \ |