- reenable and clean up _smp_mflags, with a comment on how to disable it

Changed files:
    rpm.macros -> 1.510

diff --git a/rpm.macros b/rpm.macros
index 69061b06aef7e10cc6fe679dd1f474bf7c75d886..d14a29eee136f85bd3982f4ede35fef45f227722 100644 (file)
--- a/rpm.macros
+++ b/rpm.macros
@@ -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}
-
-%_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))")
+#
+# 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 %(_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 \