- updated to 7.3.0, merged some patches from PLD, not tested yet

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

diff --git a/php-libtool.patch b/php-libtool.patch
index 5f2cf6ea5d6e9920de96f3f39ea6e4f320d29de2..e738fd44d5e5b2ce97baaf50e43c76f340c6ba50 100644 (file)
--- a/php-libtool.patch
+++ b/php-libtool.patch
@@ -1,5 +1,5 @@
---- 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
+--- php-7.3.0/scripts/phpize.in        2018-12-08 20:10:13.014403000 +0000
++++ php-7.3.0/scripts/phpize.in        2018-12-08 20:11:24.419403000 +0000
 @@ -6,10 +6,16 @@
  exec_prefix="`eval echo @exec_prefix@`"
  phpdir="`eval echo @libdir@`/php/php@program_suffix@/build"
@@ -8,19 +8,19 @@
  builddir="`pwd`"
  SED="@SED@"
  
--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"
+-FILES_BUILD="mkdep.awk scan_makefile_in.awk shtool libtool.m4 ax_check_compile_flag.m4 ax_gcc_func_attribute.m4"
++FILES_BUILD="mkdep.awk scan_makefile_in.awk shtool ax_check_compile_flag.m4 ax_gcc_func_attribute.m4"
 +if [ -f "$aclocaldir/ltsugar.m4" ]; then
-+    LIBTOOL_FILES="libtool.m4 ax_check_compile_flag.m4 ltoptions.m4 ltsugar.m4 ltversion.m4 lt~obsolete.m4"
++    LIBTOOL_FILES="libtool.m4 ltoptions.m4 ltsugar.m4 ltversion.m4 lt~obsolete.m4"
 +else
-+    LIBTOOL_FILES="libtool.m4 ax_check_compile_flag.m4"
++    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 \
-@@ -145,8 +151,9 @@ phpize_copy_files()
+ 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 @@
    test -d build || mkdir build
-  
+ 
    (cd "$phpdir" && cp $FILES_BUILD "$builddir"/build)
 +  (cd "$aclocaldir" && cp $LIBTOOL_FILES "$builddir"/build)
    (cd "$phpdir" && cp $FILES "$builddir")