packages: apache/apache.spec - strip ccache from confi_vars.mk. confuses ph...

glen glen at pld-linux.org
Mon Mar 12 11:43:15 CET 2012


Author: glen                         Date: Mon Mar 12 10:43:15 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- strip ccache from confi_vars.mk. confuses php buildsystem (libtool needs --tag=CC passed is alternative fix there)

---- Files affected:
packages/apache:
   apache.spec (1.676 -> 1.677) 

---- Diffs:

================================================================
Index: packages/apache/apache.spec
diff -u packages/apache/apache.spec:1.676 packages/apache/apache.spec:1.677
--- packages/apache/apache.spec:1.676	Mon Mar 12 11:17:26 2012
+++ packages/apache/apache.spec	Mon Mar 12 11:43:09 2012
@@ -43,7 +43,7 @@
 Summary(tr.UTF-8):	Lider WWW tarayıcı
 Name:		apache
 Version:	2.4.1
-Release:	0.2
+Release:	0.3
 License:	Apache v2.0
 Group:		Networking/Daemons/HTTP
 Source0:	http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz
@@ -2407,6 +2407,9 @@
 %{__make} -C build install \
 	DESTDIR=$RPM_BUILD_ROOT
 
+# clean "ccache" prefix. confuses other build systems (like php)
+%{__sed} -ire '/^(CC|CPP|CXX)/ s/ccache //' $RPM_BUILD_ROOT%{_libdir}/%{name}/build/config_vars.mk
+
 install %{SOURCE31} $RPM_BUILD_ROOT%{systemdunitdir}/httpd.service
 ln -s %{systemdunitdir}/httpd.service $RPM_BUILD_ROOT/etc/systemd/system/httpd.service
 ln -s %{_libexecdir} $RPM_BUILD_ROOT%{_sysconfdir}/modules
@@ -3525,6 +3528,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.677  2012/03/12 10:43:09  glen
+- strip ccache from confi_vars.mk. confuses php buildsystem (libtool needs --tag=CC passed is alternative fix there)
+
 Revision 1.676  2012/03/12 10:17:26  glen
 - move apxs to sbindir, everything in pld expects it to be there
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/apache/apache.spec?r1=1.676&r2=1.677&f=u



More information about the pld-cvs-commit mailing list