X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=fix-test-run.patch;h=d4ac247311b800546bcd4274879688df37b8fe11;hb=refs%2Fheads%2FPHP_8_1;hp=bd3c3d7df0a98473f9eede0135cb1a9744eb7830;hpb=1cf39e06dc3114fcbf1d26231cde765d28c4a30c;p=packages%2Fphp.git

diff --git a/fix-test-run.patch b/fix-test-run.patch
index bd3c3d7..d4ac247 100644
--- a/fix-test-run.patch
+++ b/fix-test-run.patch
@@ -1,20 +1,7 @@
---- php-5.4.0alpha2/configure.ac~	2011-08-07 12:43:31.000000000 +0300
-+++ php-5.4.0alpha2/configure.ac	2011-08-07 12:44:11.495394662 +0300
-@@ -1271,6 +1271,11 @@
-   ;;
- esac
- 
-+# shift so that pcre, spl, ... are loaded first
-+PHP_MODULES=$(echo "$PHP_MODULES" | sed -e 's,\(.*\)\(\$(phplibdir)/xml.la \),\2\1,')
-+PHP_MODULES=$(echo "$PHP_MODULES" | sed -e 's,\(.*\)\(\$(phplibdir)/spl.la \),\2\1,')
-+PHP_MODULES=$(echo "$PHP_MODULES" | sed -e 's,\(.*\)\(\$(phplibdir)/pcre.la \),\2\1,')
-+
- PHP_SUBST_OLD(PHP_INSTALLED_SAPIS)
- 
- PHP_SUBST(PHP_EXECUTABLE)
---- php-5.5.11/Makefile.global	2014-04-27 15:05:38.963814051 +0300
-+++ php-5.5.11/Makefile.global	2014-04-27 15:09:54.438443707 +0300
-@@ -81,8 +81,15 @@
+diff -urNp -x '*.orig' php-8.1.21.org/build/Makefile.global php-8.1.21/build/Makefile.global
+--- php-8.1.21.org/build/Makefile.global	2023-07-10 19:20:41.273462676 +0200
++++ php-8.1.21/build/Makefile.global	2023-07-10 19:20:42.545480764 +0200
+@@ -81,8 +81,15 @@ install-headers:
  		done; \
  	fi
  
@@ -30,16 +17,28 @@
 +	fi; \
  	if test "x$(PHP_MODULES)" != "x"; then \
  		for i in $(PHP_MODULES)""; do \
- 			. $$i; $(top_srcdir)/build/shtool echo -n -- " -d extension=$$dlname"; \
-@@ -111,7 +118,10 @@
+ 			. $$i; \
+@@ -114,7 +121,9 @@ test: all
  		TEST_PHP_EXECUTABLE=$(PHP_EXECUTABLE) \
  		TEST_PHP_SRCDIR=$(top_srcdir) \
  		CC="$(CC)" \
 -			$(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); \
 +			$(PHP_EXECUTABLE) -n -c $(top_builddir)/tmp-php.ini \
-+			-d extension_dir=$(top_builddir)/modules/ -d 'extension=$(EXTENSION_DIR)/pcre.$(SHLIB_DL_SUFFIX_NAME)' \
 +			$(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) $(RUN_TESTS_SETTINGS) $(TESTS); \
  		TEST_RESULT_EXIT_CODE=$$?; \
  		rm $(top_builddir)/tmp-php.ini; \
  		exit $$TEST_RESULT_EXIT_CODE; \
+diff -urNp -x '*.orig' php-8.1.21.org/configure.ac php-8.1.21/configure.ac
+--- php-8.1.21.org/configure.ac	2023-07-10 19:20:41.283462818 +0200
++++ php-8.1.21/configure.ac	2023-07-10 19:20:42.545480764 +0200
+@@ -1430,6 +1430,9 @@ if test -n "${PHP_BUILD_ARCH}"; then
+   AC_DEFINE_UNQUOTED(PHP_BUILD_ARCH,"$PHP_BUILD_ARCH",[build architecture])
+ fi
+ 
++# shift so that extensions like xml are loaded first
++PHP_MODULES=$(echo "$PHP_MODULES" | sed -e 's,\(.*\)\(\$(phplibdir)/xml.la \),\2\1,')
++
+ PHP_SUBST_OLD(PHP_INSTALLED_SAPIS)
+ 
+ PHP_SUBST(PHP_FASTCGI_OBJS)