This commit was manufactured by cvs2git to create branch 'DEVEL'.

[packages/php.git] / fix-test-run.patch

diff --git a/fix-test-run.patch b/fix-test-run.patch
index e626605f613c6ea89b3c20a178431264568d3b8a..33d072c0d32bbb74b3d543f3d0127aada7cdd39b 100644 (file)
--- a/fix-test-run.patch
+++ b/fix-test-run.patch
@@ -1,17 +1,17 @@
---- php-5.3.2/configure.in~    2010-03-16 12:16:56.000000000 +0200
-+++ php-5.3.2/configure.in     2010-03-16 16:13:24.926435546 +0200
-@@ -1224,6 +1224,11 @@
- PHP_SUBST(PHP_CLI_OBJS)
- PHP_SUBST(PHP_GLOBAL_OBJS)
+--- php-5.4.0alpha2/configure.in~      2011-08-07 12:43:31.000000000 +0300
++++ php-5.4.0alpha2/configure.in       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(PHP_MODULES)
- PHP_SUBST(PHP_ZEND_EX)
+ PHP_SUBST_OLD(PHP_INSTALLED_SAPIS)
  
+ PHP_SUBST(PHP_EXECUTABLE)
 --- php-5.3.4/Makefile.global~ 2010-12-12 23:08:32.000000000 +0200
 +++ php-5.3.4/Makefile.global  2010-12-12 23:09:31.246644108 +0200
 @@ -77,7 +77,8 @@