SOURCES: rpm.macros - %_smp_mflags had CPU*2, where did it go?

glen glen at pld-linux.org
Sat Oct 4 22:26:03 CEST 2008


Author: glen                         Date: Sat Oct  4 20:26:03 2008 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- %_smp_mflags had CPU*2, where did it go?

---- Files affected:
SOURCES:
   rpm.macros (1.480 -> 1.481) 

---- Diffs:

================================================================
Index: SOURCES/rpm.macros
diff -u SOURCES/rpm.macros:1.480 SOURCES/rpm.macros:1.481
--- SOURCES/rpm.macros:1.480	Fri Oct  3 21:19:20 2008
+++ SOURCES/rpm.macros	Sat Oct  4 22:25:57 2008
@@ -57,8 +57,8 @@
 %_dependency_whiteout	%{nil}
 
 %_smp_mflags %([ -z "$RPM_BUILD_NCPUS" ] \\\
-	&& RPM_BUILD_NCPUS="`/usr/bin/getconf _NPROCESSORS_ONLN`"; \\\
-	[ "$RPM_BUILD_NCPUS" -gt 1 ] && echo "-j$RPM_BUILD_NCPUS")
+	&& RPM_BUILD_NCPUS=$(/usr/bin/getconf _NPROCESSORS_ONLN); \\\
+	[ "$RPM_BUILD_NCPUS" -gt 1 ] && echo "-j$RPM_BUILD_NCPUS * 2")
 
 #-----------------------------------------------------------------
 #
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/rpm.macros?r1=1.480&r2=1.481&f=u



More information about the pld-cvs-commit mailing list