petersen pushed to ghc (f22). "override "make %{?_smp_mflags}" in mock/koji if not -j16 (..more)"

[notifications at fedoraproject.org]

>From b42ca29adcb7b0906bf2f417cf5dc39ddd315b54 Mon Sep 17 00:00:00 2001
From: Jens Petersen <petersen at redhat.com>
Date: Sun, 15 Feb 2015 21:59:29 +0900
Subject: override "make %{?_smp_mflags}" in mock/koji if not -j16

- in koji HOSTNAME is ""
- from testing in koji: -j8 was too small and -j12 seemed big enough

diff --git a/ghc.spec b/ghc.spec
index 2188814..c02f355 100644
--- a/ghc.spec
+++ b/ghc.spec
@@ -343,11 +343,20 @@ export LDFLAGS="${LDFLAGS:-%__global_ldflags}"
 
 # avoid "ghc: hGetContents: invalid argument (invalid byte sequence)"
 export LANG=en_US.utf8
-echo _smp_mflags is '%{?_smp_mflags}'
+
+echo _smp_mflags is \'%{?_smp_mflags}\'
+# NB for future ghc versions we should probably hardcode max -j4 instead for all builds to avoid this
+MAKE_JOBS=%{?_smp_mflags}
 %ifarch %{ix86} x86_64
-%global _smp_mflags -j16
+# hack to perserve the high "make -j" ghc ABI hashes for 7.8.4 koji/mock builds
+# (-j12 seems to be sufficient but not -j8)
+if [ -z "$HOSTNAME" -a "%{?_smp_mflags}" != "-j16" ]; then
+  echo "Overriding for koji/mock Intel builds to preserve the ghc ABI hashes:"
+  MAKE_JOBS=-j16
+fi
 %endif
-make %{?_smp_mflags}
+
+make $MAKE_JOBS
 
 
 %install
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/ghc.git/commit/?h=f22&id=b42ca29adcb7b0906bf2f417cf5dc39ddd315b54