packages: php/php.spec - fix without embed install
glen
glen at pld-linux.org
Sat Nov 5 21:39:20 CET 2011
Author: glen Date: Sat Nov 5 20:39:20 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- fix without embed install
---- Files affected:
packages/php:
php.spec (1.965 -> 1.966)
---- Diffs:
================================================================
Index: packages/php/php.spec
diff -u packages/php/php.spec:1.965 packages/php/php.spec:1.966
--- packages/php/php.spec:1.965 Sat Nov 5 19:35:43 2011
+++ packages/php/php.spec Sat Nov 5 21:39:15 2011
@@ -2482,8 +2482,10 @@
# fix install paths, avoid evil rpaths
sed -i -e "s|^libdir=.*|libdir='%{_libdir}'|" $RPM_BUILD_ROOT%{_libdir}/libphp_common.la
+%if %{with embed}
# libphp5.la contains our buildroot in dependency_libs
sed -i -e "/dependency_libs/ s,/[^ ]*/libs/libphp_common.la,%{_libdir}/libphp_common.la," $RPM_BUILD_ROOT%{_libdir}/libphp5.la
+%endif
# better solution?
sed -i -e 's|libphp_common.la|$(libdir)/libphp_common.la|' $RPM_BUILD_ROOT%{_libdir}/php/build/acinclude.m4
@@ -3328,6 +3330,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.966 2011/11/05 20:39:15 glen
+- fix without embed install
+
Revision 1.965 2011/11/05 18:35:43 glen
- build enchant extension
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/php/php.spec?r1=1.965&r2=1.966&f=u
More information about the pld-cvs-commit
mailing list