packages: util-linux-ng/util-linux-ng.spec - run diet without ccache

glen glen at pld-linux.org
Fri May 7 08:50:43 CEST 2010


Author: glen                         Date: Fri May  7 06:50:43 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- run diet without ccache

---- Files affected:
packages/util-linux-ng:
   util-linux-ng.spec (1.65 -> 1.66) 

---- Diffs:

================================================================
Index: packages/util-linux-ng/util-linux-ng.spec
diff -u packages/util-linux-ng/util-linux-ng.spec:1.65 packages/util-linux-ng/util-linux-ng.spec:1.66
--- packages/util-linux-ng/util-linux-ng.spec:1.65	Fri May  7 08:46:09 2010
+++ packages/util-linux-ng/util-linux-ng.spec	Fri May  7 08:50:37 2010
@@ -555,9 +555,10 @@
 %{__automake}
 CPPFLAGS="%{rpmcppflags} -I/usr/include/ncurses -DHAVE_LSEEK64_PROTOTYPE -DHAVE_LLSEEK_PROTOTYPE"; export CPPFLAGS
 %if %{with initrd}
+%{?with_uClibc:xCC="%{_target_cpu}-uclibc-gcc"}
+%{?with_dietlibc:xCC="diet %{__cc}"; xCC=${xCC#*ccache }}
 %configure \
-	%{?with_uClibc:CC="%{_target_cpu}-uclibc-gcc"} \
-	%{?with_dietlibc:CC="diet %{__cc}"} \
+	CC="$xCC" \
 	--disable-shared \
 	--enable-static \
 	--disable-fsck \
@@ -576,7 +577,6 @@
 	%if %{with dietlibc}
 		CPPFLAGS="$CPPFLAGS -Dprogram_invocation_short_name=NULL" \
 		LDFLAGS="-lcompat"
-
 	%endif
 done
 
@@ -1371,6 +1371,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.66  2010/05/07 06:50:37  glen
+- run diet without ccache
+
 Revision 1.65  2010/05/07 06:46:09  glen
 - bring ac into play
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/util-linux-ng/util-linux-ng.spec?r1=1.65&r2=1.66&f=u



More information about the pld-cvs-commit mailing list