- first batch of rediffed patches

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

diff --git a/php-libtool.patch b/php-libtool.patch
index f9713d808e36cefd94bf442e9e1ebef78278d5e5..9881c9a70a520b1216eca610d3bbed584d0fcd44 100644 (file)
--- a/php-libtool.patch
+++ b/php-libtool.patch
@@ -1,6 +1,7 @@
---- php-5.4.6/scripts/phpize.in~       2012-08-23 03:02:42.000000000 +0300
-+++ php-5.4.6/scripts/phpize.in        2012-08-23 10:16:37.011306948 +0300
-@@ -6,10 +6,16 @@
+diff -urNp -x '*.orig' php-7.2.34.org/scripts/phpize.in php-7.2.34/scripts/phpize.in
+--- php-7.2.34.org/scripts/phpize.in   2021-08-24 01:07:39.579918736 +0200
++++ php-7.2.34/scripts/phpize.in       2021-08-24 01:07:40.736584469 +0200
+@@ -6,10 +6,16 @@ datarootdir='@datarootdir@'
  exec_prefix="`eval echo @exec_prefix@`"
  phpdir="`eval echo @libdir@`/php/build"
  includedir="`eval echo @includedir@`/php"
@@ -8,19 +9,19 @@
  builddir="`pwd`"
  SED="@SED@"
  
--FILES_BUILD="mkdep.awk scan_makefile_in.awk shtool libtool.m4"
-+FILES_BUILD="mkdep.awk scan_makefile_in.awk shtool"
+-FILES_BUILD="mkdep.awk scan_makefile_in.awk shtool libtool.m4 ax_check_compile_flag.m4"
++FILES_BUILD="mkdep.awk scan_makefile_in.awk shtool ax_check_compile_flag.m4"
 +if [ -f "$aclocaldir/ltsugar.m4" ]; then
 +    LIBTOOL_FILES="libtool.m4 ltoptions.m4 ltsugar.m4 ltversion.m4 lt~obsolete.m4"
 +else
 +    LIBTOOL_FILES="libtool.m4"
 +fi
  FILES="acinclude.m4 Makefile.global config.sub config.guess ltmain.sh run-tests*.php"
- CLEAN_FILES="$FILES *.o *.lo *.la .deps .libs/ build/ include/ modules/ install-sh \
-       mkinstalldirs missing config.nice config.sub config.guess configure configure.in \
+ CLEAN_FILES="$FILES *.o *.lo *.la .libs/ build/ modules/ install-sh \
+       mkinstalldirs missing config.nice config.sub config.guess configure configure.ac \
 @@ -145,8 +151,9 @@ phpize_copy_files()
    test -d build || mkdir build
-  
+ 
    (cd "$phpdir" && cp $FILES_BUILD "$builddir"/build)
 +  (cd "$aclocaldir" && cp $LIBTOOL_FILES "$builddir"/build)
    (cd "$phpdir" && cp $FILES "$builddir")