commit dd7fb1c7504355c0d60fe52e556a7f612b1d57be
Author: Elan Ruusamäe <[email protected]>
Date: Thu Apr 18 12:06:24 2013 +0300
fix __jobs macro for < 3 cpus
memoized macros must have a "value"
rpm-build-macros.spec | 2 +-
rpm.macros | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/rpm-build-macros.spec b/rpm-build-macros.spec
index df6f4d6..496157b 100644
--- a/rpm-build-macros.spec
+++ b/rpm-build-macros.spec
@@ -4,7 +4,7 @@ Summary: PLD Linux RPM build macros
Summary(pl.UTF-8): Makra do budowania pakietów RPM dla Linuksa PLD
Name: rpm-build-macros
Version: %{rpm_macros_rev}
-Release: 1
+Release: 2
License: GPL
Group: Development/Building
Source0: rpm.macros
diff --git a/rpm.macros b/rpm.macros
index ee6b685..351e41a 100644
--- a/rpm.macros
+++ b/rpm.macros
@@ -30,7 +30,7 @@
#
# if you want to disable parallel build do:
# echo '%__jobs %{nil}' >> ~/.rpmmacros
-%__jobs %{expand:%%global __jobs %(_NCPUS=$(/usr/bin/getconf
_NPROCESSORS_ONLN); [ "$_NCPUS" -gt 2 ] && echo $(($_NCPUS / 2)))}%__jobs
+%__jobs %{expand:%%global __jobs %(_NCPUS=$(/usr/bin/getconf
_NPROCESSORS_ONLN); [ "$_NCPUS" -gt 2 ] && echo $(($_NCPUS / 2)))%%{nil}}%__jobs
# expands to -jN if %__jobs has a value
%_smp_mflags %{expand:%%global _smp_mflags %(jobs=%{__jobs}; echo
${jobs:+-j$jobs}%%{nil})}%_smp_mflags
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/rpm-build-macros.git/commitdiff/799bf7abaada306a6f7ff500890aaceffd6d801c
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
