[packages/php/dev-7.4] force use of system libtool

glen glen at pld-linux.org
Tue Jun 18 09:49:20 CEST 2019


commit 58752a4bf92853bb7c45b6ef5b475be26a9fc6ea
Author: Elan Ruusamäe <glen at pld-linux.org>
Date:   Sat Jun 15 20:56:07 2019 +0300

    force use of system libtool

 php.spec | 5 +++++
 1 file changed, 5 insertions(+)
---
diff --git a/php.spec b/php.spec
index 0d39b62..c7f8be8 100644
--- a/php.spec
+++ b/php.spec
@@ -2203,8 +2203,13 @@ export EXTENSION_DIR="%{php_extensiondir}"
 if [ ! -f _built-conf ]; then
 	# now remove Makefile copies
 	rm -f Makefile.{cgi-fcgi,fpm,cli,apxs1,apxs2,litespeed,phpdbg,milter}
+
+	# Force use of system libtool:
+	mv build/libtool.m4 build/libtool.m4.saved
+	cat %{_aclocaldir}/{libtool,ltoptions,ltsugar,ltversion,lt~obsolete}.m4 > build/libtool.m4
 	%{__libtoolize}
 	%{__aclocal}
+
 	cp -f /usr/share/automake/config.* .
 	./buildconf --force
 	touch _built-conf
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/php.git/commitdiff/c91d4fb9f019d5c9c657d81edf00813c7387856a



More information about the pld-cvs-commit mailing list