commit a10876ec816e04b20623c23d4adb89dfbc364466
Author: Elan Ruusamäe <[email protected]>
Date: Wed Jan 21 20:56:35 2015 +0200
support libtool 1.5/2.4.2/2.4.4 selecting best match
php.spec | 22 ++++++++++++----------
1 file changed, 12 insertions(+), 10 deletions(-)
---
diff --git a/php.spec b/php.spec
index df5bf56..9ed4cf3 100644
--- a/php.spec
+++ b/php.spec
@@ -2517,17 +2517,19 @@ install -d
$RPM_BUILD_ROOT%{_sysconfdir}/{cgi-fcgi,cli,apache,apache2handler}.d
mv $RPM_BUILD_ROOT%{_sysconfdir}/{conf.d/readline.ini,cli.d}
# use system automake and {lib,sh}tool
-%if "%{pld_release}" != "ac"
- ln -snf /usr/share/automake/config.{guess,sub}
$RPM_BUILD_ROOT%{_libdir}/%{name}/build
- for i in libtool.m4 lt~obsolete.m4 ltoptions.m4 ltsugar.m4
ltversion.m4; do
- ln -snf %{_aclocaldir}/${i}
$RPM_BUILD_ROOT%{_libdir}/%{name}/build
- done
- ln -snf %{_datadir}/libtool/config/ltmain.sh
$RPM_BUILD_ROOT%{_libdir}/%{name}/build
-%else
- ln -snf %{_aclocaldir}/libtool.m4
$RPM_BUILD_ROOT%{_libdir}/%{name}/build
- ln -snf %{_datadir}/libtool/ltmain.sh
$RPM_BUILD_ROOT%{_libdir}/%{name}/build
-%endif
+ln -snf /usr/share/automake/config.{guess,sub}
$RPM_BUILD_ROOT%{_libdir}/%{name}/build
ln -snf %{_bindir}/shtool $RPM_BUILD_ROOT%{_libdir}/%{name}/build
+for fn in libtool.m4 lt~obsolete.m4 ltoptions.m4 ltsugar.m4 ltversion.m4; do
+ f=%{_aclocaldir}/$fn
+ test -f $f || continue
+ ln -snf $f $RPM_BUILD_ROOT%{_libdir}/%{name}/build
+done
+for fn in ltmain.sh config/ltmain.sh build-aux/ltmain.sh; do
+ f=/usr/share/libtool/$fn
+ test -f $f || continue
+ ln -snf $f $RPM_BUILD_ROOT%{_libdir}/%{name}/build
+ break
+done
sed -i -e '/^phpdir/ s,/php/build,/%{name}/build,'
$RPM_BUILD_ROOT%{_bindir}/phpize
# for php-pecl-mailparse
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/php.git/commitdiff/c3979b6249ececbabd269c9c33c90da8408c4edd
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
