- rediff patches, merged duplicate triggers

[packages/php.git] / php-builddir.patch

diff --git a/php-builddir.patch b/php-builddir.patch
index 783dc2bea786979309783fed99a9c217b65d589d..f29f3fdf4f32d9a7b6817ded9894434ed69534c9 100644 (file)
--- a/php-builddir.patch
+++ b/php-builddir.patch
@@ -1,6 +1,6 @@
-diff -urbB php-5.0.5.org/scripts/Makefile.frag php-5.0.5/scripts/Makefile.frag
---- php-5.0.5.org/scripts/Makefile.frag        2005-09-10 21:29:04.884122000 +0200
-+++ php-5.0.5/scripts/Makefile.frag    2005-09-10 21:30:09.333324848 +0200
+diff -urNp -x '*.orig' php-5.6.40.org/scripts/Makefile.frag php-5.6.40/scripts/Makefile.frag
+--- php-5.6.40.org/scripts/Makefile.frag       2019-01-09 10:54:13.000000000 +0100
++++ php-5.6.40/scripts/Makefile.frag   2021-08-23 23:19:13.635805958 +0200
 @@ -4,7 +4,7 @@
  #
  
@@ -10,15 +10,15 @@ diff -urbB php-5.0.5.org/scripts/Makefile.frag php-5.0.5/scripts/Makefile.frag
  
  BUILD_FILES = \
        scripts/phpize.m4 \
-diff -urbB php-5.0.5.org/scripts/phpize.in php-5.0.5/scripts/phpize.in
---- php-5.0.5.org/scripts/phpize.in    2005-06-15 19:19:41.000000000 +0200
-+++ php-5.0.5/scripts/phpize.in        2005-09-10 21:51:45.523274024 +0200
-@@ -3,7 +3,7 @@
- # Variable declaration
+diff -urNp -x '*.orig' php-5.6.40.org/scripts/phpize.in php-5.6.40/scripts/phpize.in
+--- php-5.6.40.org/scripts/phpize.in   2019-01-09 10:54:13.000000000 +0100
++++ php-5.6.40/scripts/phpize.in       2021-08-23 23:19:13.635805958 +0200
+@@ -4,7 +4,7 @@
  prefix='@prefix@'
+ datarootdir='@datarootdir@'
  exec_prefix="`eval echo @exec_prefix@`"
 -phpdir="`eval echo @libdir@`/build"
 +phpdir="`eval echo @libdir@`/php/build"
  includedir="`eval echo @includedir@`/php"
  builddir="`pwd`"
- 
+ SED="@SED@"