From 458ba66b676eba066beb1ffd6433d37290be920c Mon Sep 17 00:00:00 2001
From: Jens Petersen <petersen@redhat.com>
Date: Thu, 29 Sep 2011 15:42:49 +0900
Subject: [PATCH] =?UTF-8?q?no=20need=20to=20specify=20-lffi=20in=20build.m?=
 =?UTF-8?q?k=20(Henrik=20Nordstr=C3=B6m)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ghc.spec | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/ghc.spec b/ghc.spec
index 63e16a0..059b38f 100644
--- a/ghc.spec
+++ b/ghc.spec
@@ -11,7 +11,10 @@
 #%%{?ghc_test}
 #%%global without_hscolour 1
 
-# archs that use system libffi
+# faster:
+#%%global without_testsuite 1
+
+# archs that use system libffi (needs fixing for secondary archs)
 %global libffi_archs %{ix86} x86_64
 
 # unregisterized archs
@@ -34,7 +37,7 @@ Version: 7.0.4
 # - release can only be reset if all library versions get bumped simultaneously
 #   (eg for a major release)
 # - minor release numbers should be incremented monotonically
-Release: 29%{?dist}
+Release: 30%{?dist}
 Summary: Glasgow Haskell Compiler
 # fedora ghc has been bootstrapped on the following archs:
 #ExclusiveArch: %{ix86} x86_64 ppc alpha sparcv9 ppc64 armv7hl
@@ -199,9 +202,6 @@ BUILD_DOCBOOK_HTML = NO
 %if %{undefined without_hscolour}
 HSCOLOUR_SRCS = NO
 %endif
-%ifarch %{libffi_archs}
-SRC_HC_OPTS += -lffi
-%endif
 %ifarch %{unregisterised_archs}
 GhcUnregisterised=YES
 %endif
@@ -387,6 +387,9 @@ fi
 %defattr(-,root,root,-)
 
 %changelog
+* Thu Sep 29 2011 Jens Petersen <petersen@redhat.com> - 7.0.4-30
+- no need to specify -lffi in build.mk (Henrik Nordström)
+
 * Wed Sep 28 2011 Jens Petersen <petersen@redhat.com> - 7.0.4-29
 - port to armv7hl by Henrik Nordström (#741725)