- updated to 7.4.0, partial PLD merge, release 0.1 (not tested yet)

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

diff --git a/php-libtool.patch b/php-libtool.patch
deleted file mode 100644 (file)
index e738fd4..0000000
--- a/php-libtool.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- 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"
- includedir="`eval echo @includedir@`/php/php@program_suffix@"
-+aclocaldir="$prefix/share/aclocal"
- builddir="`pwd`"
- SED="@SED@"
- 
--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 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 .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")
--  (cd "$builddir" && cat acinclude.m4 ./build/libtool.m4 > aclocal.m4)
-+  (cd "$builddir/build" && cat ../acinclude.m4 $LIBTOOL_FILES > ../aclocal.m4)
- }
- 
- phpize_replace_prefix()