[packages/popt] be friendly with ccache and diet

glen glen at pld-linux.org
Sun Sep 16 14:55:28 CEST 2012


commit 87b9109282ec4d1df1a36c67df5afe169007c32b
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Sun Sep 16 15:54:22 2012 +0300

    be friendly with ccache and diet

 popt.spec | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
---
diff --git a/popt.spec b/popt.spec
index 94023c6..143e2bf 100644
--- a/popt.spec
+++ b/popt.spec
@@ -1,7 +1,7 @@
 #
 # Conditional build:
 %bcond_without	dietlibc	# don't build static dietlibc library
-#
+
 Summary:	C library for parsing command line parameters
 Summary(de.UTF-8):	C-Library zum Parsen von Befehlszeilenparametern
 Summary(fr.UTF-8):	Bibliothèque C pour analyser les paramètres de la ligne de commande
@@ -170,8 +170,9 @@ sed -i -e 's#po/Makefile.in intl/Makefile##g' configure.ac
 %{__automake} -i
 
 %if %{with dietlibc}
+__cc="%{__cc}"
 %configure \
-	CC="diet %{__cc} %{rpmcflags} %{rpmldflags} -Os -static" \
+	CC="diet ${__cc#ccache } %{rpmcflags} %{rpmldflags} -Os -static" \
 	ac_cv_func_stpcpy=yes \
 	--enable-static \
 	--disable-shared
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/popt.git/commitdiff/73f13399769512d3dba03b6dab650d04aba8187d



More information about the pld-cvs-commit mailing list