[ghc/f17] bring back rest of powerpc pthread patch for aclocal ghc-pwd
Jens Petersen
petersen at fedoraproject.org
Fri Mar 9 01:59:19 UTC 2012
commit af33d867e7e4e94f746a523beb387a86a4909097
Author: Jens Petersen <petersen at redhat.com>
Date: Fri Mar 9 10:59:03 2012 +0900
bring back rest of powerpc pthread patch for aclocal ghc-pwd
ghc-powerpc-pthread.patch | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 deletions(-)
---
diff --git a/ghc-powerpc-pthread.patch b/ghc-powerpc-pthread.patch
index 1643fd7..f0b8c60 100644
--- a/ghc-powerpc-pthread.patch
+++ b/ghc-powerpc-pthread.patch
@@ -1,5 +1,17 @@
-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
+diff -up ghc-7.0.2/aclocal.m4.pthread ghc-7.0.2/aclocal.m4
+--- ghc-7.0.2/aclocal.m4.pthread 2011-02-28 13:10:03.000000000 -0500
++++ ghc-7.0.2/aclocal.m4 2011-04-20 07:12:36.489772545 -0400
+@@ -1385,7 +1385,7 @@ AC_MSG_NOTICE(Building in-tree ghc-pwd)
+ dnl except we don't want to have to know what make is called. Sigh.
+ rm -rf utils/ghc-pwd/dist-boot
+ mkdir utils/ghc-pwd/dist-boot
+- if ! "$WithGhc" -v0 -no-user-package-conf -hidir utils/ghc-pwd/dist-boot -odir utils/ghc-pwd/dist-boot -stubdir utils/ghc-pwd/dist-boot --make utils/ghc-pwd/Main.hs -o utils/ghc-pwd/dist-boot/ghc-pwd
++ if ! "$WithGhc" -optl-pthread -v0 -no-user-package-conf -hidir utils/ghc-pwd/dist-boot -odir utils/ghc-pwd/dist-boot -stubdir utils/ghc-pwd/dist-boot --make utils/ghc-pwd/Main.hs -o utils/ghc-pwd/dist-boot/ghc-pwd
+ then
+ AC_MSG_ERROR([Building ghc-pwd failed])
+ fi
+diff -up ghc-7.0.4/ghc/ghc.wrapper.pthread ghc-7.0.4/ghc/ghc.wrapper
+--- ghc-7.0.4/ghc/ghc.wrapper.pthread 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+"$@"}
More information about the scm-commits
mailing list