Author: baggins Date: Wed Mar 18 10:07:35 2009 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- reenable and clean up _smp_mflags, with a comment on how to disable it
---- Files affected:
SOURCES:
rpm.macros (1.509 -> 1.510)
---- Diffs:
================================================================
Index: SOURCES/rpm.macros
diff -u SOURCES/rpm.macros:1.509 SOURCES/rpm.macros:1.510
--- SOURCES/rpm.macros:1.509 Wed Mar 18 10:49:21 2009
+++ SOURCES/rpm.macros Wed Mar 18 11:07:29 2009
@@ -20,14 +20,17 @@
%__autopoint autopoint --force
# add parallel build flags: -jN
-#__make make %{?_smp_mflags}
-#__scons scons %{?_smp_mflags}
-#__waf waf %{?_smp_mflags}
-#__cmake cmake %{?_smp_mflags}
+#
+# if you want to disable parallel build do
+# echo '%_smp_mflags %{nil}' >> ~/.rpmmacros
+#
+%__make make %{?_smp_mflags}
+%__scons scons %{?_smp_mflags}
+%__waf waf %{?_smp_mflags}
+%__cmake cmake %{?_smp_mflags}
-%_smp_mflags %([ -z "$RPM_BUILD_NCPUS" ] \\\
- && RPM_BUILD_NCPUS=$(/usr/bin/getconf _NPROCESSORS_ONLN); \\\
- [ "$RPM_BUILD_NCPUS" -gt 1 ] && echo "-j$(($RPM_BUILD_NCPUS * 2))")
+%_smp_mflags %(_NCPUS=$(/usr/bin/getconf _NPROCESSORS_ONLN); \\\
+ [ "$_NCPUS" -gt 1 ] && echo "-j$(($_NCPUS *
2))")
%__gettextize { \
if grep -qs 'AM_GNU_GETTEXT.*external' configure.{ac,in} ; then \
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/rpm.macros?r1=1.509&r2=1.510&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
