[patch] PHP7.4 libtool patch

portage-php74.patch (text/plain), 2.44 KB, created by Hasso Tepper on 2019-08-19 06:37:13 UTC

--- a/dev-lang/php/php-7.4.0_beta1.ebuild
+++ b/dev-lang/php/php-7.4.0_beta1.ebuild
@@ -147,6 +147,10 @@ REQUIRED_USE="
 	mssql? ( pdo )
 "
 
+PATCHES=(
+    "${FILESDIR}/php-7.4.0-libtool.patch"
+)
+
 PHP_MV="$(ver_cut 1)"
 
 php_install_ini() {
@@ -220,6 +224,10 @@ src_prepare() {
 
 	# Bug 669566 - necessary so that build tools are updated for commands like pecl
 	cp "${BROOT}/usr/share/aclocal/libtool.m4" build/ || die
+	cp "${BROOT}/usr/share/aclocal/ltversion.m4" build/ || die
+	cp "${BROOT}/usr/share/aclocal/ltoptions.m4" build/ || die
+	cp "${BROOT}/usr/share/aclocal/ltsugar.m4" build/ || die
+	cp "${BROOT}/usr/share/aclocal/lt~obsolete.m4" build/ || die
 	eautoreconf
 }
 
--- /dev/null
+++ b/dev-lang/php/files/php-7.4.0-libtool.patch
@@ -0,0 +1,37 @@
+--- a/scripts/phpize.m4	2019-08-18 12:53:05.950540441 -0000
++++ b/scripts/phpize.m4	2019-08-18 12:54:35.504593345 -0000
+@@ -5,6 +5,10 @@ dnl comments starting with # and empty n
+ m4_include([build/ax_check_compile_flag.m4])
+ m4_include([build/ax_gcc_func_attribute.m4])
+ m4_include([build/libtool.m4])
++m4_include([build/ltversion.m4])
++m4_include([build/ltoptions.m4])
++m4_include([build/ltsugar.m4])
++m4_include([build/lt~obsolete.m4])
+ m4_include([build/php_cxx_compile_stdcxx.m4])
+ m4_include([build/php.m4])
+ m4_include([build/pkg.m4])
+--- a/scripts/phpize.in	2019-08-18 12:53:15.030647158 -0000
++++ b/scripts/phpize.in	2019-08-18 12:53:52.407086547 -0000
+@@ -9,7 +9,7 @@ includedir="`eval echo @includedir@`/php
+ builddir="`pwd`"
+ SED="@SED@"
+ 
+-FILES_BUILD="php.m4 shtool libtool.m4 ax_check_compile_flag.m4 ax_gcc_func_attribute.m4 php_cxx_compile_stdcxx.m4 pkg.m4 config.guess config.sub ltmain.sh Makefile.global"
++FILES_BUILD="php.m4 shtool libtool.m4 ltversion.m4 ltoptions.m4 ltsugar.m4 lt~obsolete.m4 ax_check_compile_flag.m4 ax_gcc_func_attribute.m4 php_cxx_compile_stdcxx.m4 pkg.m4 config.guess config.sub ltmain.sh Makefile.global"
+ FILES="run-tests*.php"
+ CLEAN_FILES="$FILES *.o *.lo *.la .libs/ build/ modules/ \
+ 	config.nice configure configure.ac \
+--- a/scripts/Makefile.frag	2019-08-18 13:26:34.536795514 -0000
++++ b/scripts/Makefile.frag	2019-08-18 13:27:12.257210046 -0000
+@@ -8,6 +8,10 @@ phpbuilddir = $(libdir)/build
+ BUILD_FILES = \
+ 	scripts/phpize.m4 \
+ 	build/libtool.m4 \
++	build/ltversion.m4 \
++	build/ltoptions.m4 \
++	build/ltsugar.m4 \
++	build/lt~obsolete.m4 \
+ 	build/ltmain.sh \
+ 	build/ax_check_compile_flag.m4 \
+ 	build/ax_gcc_func_attribute.m4 \