[ghc/f17] bring back ghc-powerpc-pthread.patch needed for linking on ppc

[Jens Petersen]

commit ed642adf8d071165ad7955e9461691bb419cf2df
Author: Jens Petersen <petersen at redhat.com>
Date:   Fri Mar 9 10:21:11 2012 +0900

    bring back ghc-powerpc-pthread.patch needed for linking on ppc

 ghc-powerpc-pthread.patch |    6 ++++++
 ghc-ppc64-pthread.patch   |   18 ------------------
 ghc.spec                  |   18 ++++++++----------
 3 files changed, 14 insertions(+), 28 deletions(-)
---
diff --git a/ghc-powerpc-pthread.patch b/ghc-powerpc-pthread.patch
new file mode 100644
index 0000000..1643fd7
--- /dev/null
+++ b/ghc-powerpc-pthread.patch
@@ -0,0 +1,6 @@
+diff -u ghc-7.0.4/ghc/ghc.wrapper\~ ghc-7.0.4/ghc/ghc.wrapper
+--- ghc-7.0.4/ghc/ghc.wrapper~	2012-03-09 09:39:58.205330373 +0900
++++ ghc-7.0.4/ghc/ghc.wrapper	2012-03-09 09:41:01.791237737 +0900
+@@ -1 +1 @@
+-exec "$executablename" -B"$topdir" -pgmc "$pgmgcc" -pgma "$pgmgcc" -pgml "$pgmgcc" -pgmP "$pgmgcc -E -undef -traditional" -optc-I$(pkg-config --variable=includedir libffi) ${1+"$@"}
++exec "$executablename" -B"$topdir" -pgmc "$pgmgcc" -pgma "$pgmgcc" -pgml "$pgmgcc" -pgmP "$pgmgcc -E -undef -traditional" -optl-pthread -optc-I$(pkg-config --variable=includedir libffi) ${1+"$@"}
diff --git a/ghc.spec b/ghc.spec
index cca1d01..3fb0dcd 100644
--- a/ghc.spec
+++ b/ghc.spec
@@ -30,7 +30,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: 45%{?dist}
+Release: 46%{?dist}
 Summary: Glasgow Haskell Compiler
 # fedora ghc has been bootstrapped on the following archs:
 #ExclusiveArch: %{ix86} x86_64 ppc alpha sparcv9 ppc64 armv7hl armv5tel
@@ -81,7 +81,7 @@ Patch4: ghc-use-system-libffi.patch
 # (see http://hackage.haskell.org/trac/hackage/ticket/600)
 Patch5: Cabal-option-executable-dynamic.patch
 Patch6: ghc-fix-linking-on-sparc.patch
-Patch7: ghc-ppc64-pthread.patch
+Patch7: ghc-powerpc-pthread.patch
 # http://hackage.haskell.org/trac/ghc/ticket/4999
 Patch8: ghc-powerpc-linker-mmap.patch
 # touches configure.ac
@@ -205,13 +205,12 @@ ln -s $(pkg-config --variable=includedir libffi)/*.h libraries/base/include
 
 %patch6 -p1 -b .sparclinking
 
-%if %{defined ghc_bootstrapping}
-%ifarch ppc ppc64 s390 s390x
-%patch7 -p1 -b .pthread
-%endif
+%ifnarch %{ix86} x86_64
+%patch10 -p1 -b .10-ffi
 %endif
 
 %ifarch ppc ppc64
+%patch7 -p1 -b .pthread
 %patch8 -p1 -b .mmap
 %endif
 
@@ -219,10 +218,6 @@ ln -s $(pkg-config --variable=includedir libffi)/*.h libraries/base/include
 %patch9 -p1 -b .s390x
 %endif
 
-%ifnarch %{ix86} x86_64
-%patch10 -p1 -b .10-ffi
-%endif
-
 %build
 # http://hackage.haskell.org/trac/ghc/wiki/Platforms
 # cf https://github.com/gentoo-haskell/gentoo-haskell/tree/master/dev-lang/ghc
@@ -434,6 +429,9 @@ fi
 %files libraries
 
 %changelog
+* Fri Mar  9 2012 Jens Petersen <petersen at redhat.com> - 7.0.4-46
+- reinstate ghc-powerpc-pthread.patch needed for linking on ppc
+
 * Thu Mar  8 2012 Jens Petersen <petersen at redhat.com> - 7.0.4-45
 - patch ghc wrapper script to add libffi includedir on tier 2 archs