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 | |
| e3002b0d | 3 | @@ -1271,6 +1271,9 @@ |
| da3ee842 | 4 | AC_DEFINE_UNQUOTED(PHP_BUILD_ARCH,"$PHP_BUILD_ARCH",[build architecture]) |
| a17aa399 | 5 | fi |
| c0240cb1 | 6 | |
| e3002b0d | 7 | +# shift so that extensions like xml are loaded first |
| c0240cb1 | 8 | +PHP_MODULES=$(echo "$PHP_MODULES" | sed -e 's,\(.*\)\(\$(phplibdir)/xml.la \),\2\1,') |
| c0240cb1 | 9 | + |
| 02d2dcbb | 10 | PHP_SUBST_OLD(PHP_INSTALLED_SAPIS) |
| c0240cb1 | 11 | |
| a17aa399 | 12 | PHP_SUBST(PHP_FASTCGI_OBJS) |
| 5851c71c JB |
13 | --- php-8.1.10/build/Makefile.global.orig 2022-09-25 19:52:15.520810107 +0200 |
| 14 | +++ php-8.1.10/build/Makefile.global 2022-09-25 19:54:52.676625388 +0200 | |
| 15 | @@ -81,8 +81,15 @@ install-headers: | |
| c0240cb1 | 16 | done; \ |
| 17 | fi | |
| 18 | ||
| 19 | -PHP_TEST_SETTINGS = -d 'open_basedir=' -d 'output_buffering=0' -d 'memory_limit=-1' | |
| 20 | +PHP_TEST_SETTINGS = -d 'open_basedir=' -d 'output_buffering=0' -d 'memory_limit=-1' -d 'safe_mode=0' | |
| 5dd69fe1 | 21 | +PHP_TEST_SHARED_SYSTEM_EXTENSIONS = |
| c0240cb1 | 22 | PHP_TEST_SHARED_EXTENSIONS = ` \ |
| c0240cb1 | 23 | + if test "x$(PHP_TEST_SHARED_SYSTEM_EXTENSIONS)" != "x"; then \ |
| 24 | + for i in $(PHP_TEST_SHARED_SYSTEM_EXTENSIONS)""; do \ | |
| 25 | + dlname=$$i.$(SHLIB_DL_SUFFIX_NAME); \ | |
| 26 | + $(top_srcdir)/build/shtool echo -n -- " -d extension=$(EXTENSION_DIR)/$$dlname"; \ | |
| 27 | + done; \ | |
| ff353fa7 ER |
28 | + fi; \ |
| 29 | if test "x$(PHP_MODULES)" != "x"; then \ | |
| 30 | for i in $(PHP_MODULES)""; do \ | |
| 5851c71c JB |
31 | . $$i; \ |
| 32 | @@ -114,7 +121,9 @@ test: all | |
| c0240cb1 | 33 | TEST_PHP_EXECUTABLE=$(PHP_EXECUTABLE) \ |
| 34 | TEST_PHP_SRCDIR=$(top_srcdir) \ | |
| 35 | CC="$(CC)" \ | |
| 36 | - $(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); \ | |
| 37 | + $(PHP_EXECUTABLE) -n -c $(top_builddir)/tmp-php.ini \ | |
| c0240cb1 | 38 | + $(PHP_TEST_SETTINGS) $(top_srcdir)/run-tests.php -n -c $(top_builddir)/tmp-php.ini \ |
| 39 | + -d extension_dir=$(top_builddir)/modules/ $(PHP_TEST_SHARED_EXTENSIONS) $(RUN_TESTS_SETTINGS) $(TESTS); \ | |
| 153a312d | 40 | TEST_RESULT_EXIT_CODE=$$?; \ |
| c0240cb1 | 41 | rm $(top_builddir)/tmp-php.ini; \ |
| 153a312d | 42 | exit $$TEST_RESULT_EXIT_CODE; \ |