[ghc/f17] BR ghc-compiler; mmap patch is still needed for ppc archs

Jens Petersen petersen at fedoraproject.org
Thu Mar 8 03:17:05 UTC 2012


commit 3db371aa3181f0c596e5d829b55f033cc3b3a714
Author: Jens Petersen <petersen at redhat.com>
Date:   Mon Mar 5 18:49:03 2012 +0900

    BR ghc-compiler; mmap patch is still needed for ppc archs

 ghc.spec |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)
---
diff --git a/ghc.spec b/ghc.spec
index 4442b13..cbddc05 100644
--- a/ghc.spec
+++ b/ghc.spec
@@ -50,8 +50,9 @@ Obsoletes: ghc-dph-prim-par < 0.5, ghc-dph-prim-par-devel < 0.5, ghc-dph-prim-pa
 Obsoletes: ghc-dph-prim-seq < 0.5, ghc-dph-prim-seq-devel < 0.5, ghc-dph-prim-seq-prof < 0.5
 Obsoletes: ghc-dph-seq < 0.5, ghc-dph-seq-devel < 0.5, ghc-dph-seq-prof < 0.5
 Obsoletes: ghc-feldspar-language < 0.4, ghc-feldspar-language-devel < 0.4, ghc-feldspar-language-prof < 0.4
-# change to ghc-compiler once backported to el6
-BuildRequires: ghc %{!?ghc_bootstrapping: = %{version}}
+%if %{undefined ghc_bootstrapping}
+BuildRequires: ghc-compiler = %{version}
+%endif
 BuildRequires: ghc-rpm-macros >= 0.14
 BuildRequires: gmp-devel, libffi-devel
 BuildRequires: ghc-directory-devel, ghc-process-devel, ghc-pretty-devel, ghc-containers-devel, ghc-haskell98-devel, ghc-bytestring-devel
@@ -204,11 +205,11 @@ ln -s $(pkg-config --variable=includedir libffi)/*.h libraries/base/include
 %ifarch ppc ppc64 s390 s390x
 %patch7 -p1 -b .pthread
 %endif
+%endif
 
 %ifarch ppc ppc64
 %patch8 -p1 -b .mmap
 %endif
-%endif
 
 %ifarch s390x
 %patch9 -p1 -b .s390x
@@ -426,9 +427,10 @@ fi
 
 %changelog
 * Sat Mar  3 2012 Jens Petersen <petersen at redhat.com> - 7.0.4-44
+- BR ghc-compiler
 - add s390 and s390x to unregisterised_archs
 - add configure-s390x from debian
-- only apply ppc64 pthread and mmap patches when bootstrapping
+- only apply ppc64 pthread patch when bootstrapping
 
 * Thu Feb  9 2012 Jens Petersen <petersen at redhat.com> - 7.0.4-43
 - fix build with system libffi on secondary archs by including libffi headers


More information about the scm-commits mailing list