[Pkg-haskell-commits] darcs: ghc: Pass -lpthread everywhere. This can possibly be dropped later.

[Joachim Breitner]

Fri Mar 11 08:27:06 UTC 2011  Joachim Breitner <mail at joachim-breitner.de>
  * Pass -lpthread everywhere. This can possibly be dropped later. 
  Ignore-this: bd3edb31cee343df6046059e22378e06

    M ./changelog +1
    A ./patches/lpthread-bootstrap-workaround
    M ./patches/series +1
    M ./rules -1 +1

Fri Mar 11 08:27:06 UTC 2011  Joachim Breitner <mail at joachim-breitner.de>
  * Pass -lpthread everywhere. This can possibly be dropped later. 
  Ignore-this: bd3edb31cee343df6046059e22378e06
diff -rN -u old-ghc/changelog new-ghc/changelog
--- old-ghc/changelog	2011-03-23 07:54:55.684130448 +0000
+++ new-ghc/changelog	2011-03-23 07:54:55.724132556 +0000
@@ -4,6 +4,7 @@
     dpkg warning at upgrade time. TO BE TESTED BEFORE UPLOADING
   * Build-conflict with ccache. pbuilder installs ccache by default, which
     causes ghc to pick up a wrong path for "gcc". 
+  * Pass -lpthread everywhere. This can possibly be dropped later. 
 
  -- Joachim Breitner <nomeata at debian.org>  Wed, 09 Mar 2011 22:54:32 +0530
 
diff -rN -u old-ghc/patches/lpthread-bootstrap-workaround new-ghc/patches/lpthread-bootstrap-workaround
--- old-ghc/patches/lpthread-bootstrap-workaround	1970-01-01 00:00:00.000000000 +0000
+++ new-ghc/patches/lpthread-bootstrap-workaround	2011-03-23 07:54:55.700131291 +0000
@@ -0,0 +1,13 @@
+Index: ghc-7.0.2/aclocal.m4
+===================================================================
+--- ghc-7.0.2.orig/aclocal.m4	2011-03-11 13:55:49.000000000 +0530
++++ ghc-7.0.2/aclocal.m4	2011-03-11 13:55:52.000000000 +0530
+@@ -1385,7 +1385,7 @@
+     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 -rN -u old-ghc/patches/series new-ghc/patches/series
--- old-ghc/patches/series	2011-03-23 07:54:55.684130448 +0000
+++ new-ghc/patches/series	2011-03-23 07:54:55.728132767 +0000
@@ -7,3 +7,4 @@
 powerpc-compile-616635
 do_not_use_epoll_create1
 debian-changes-7.0.2-3
+lpthread-bootstrap-workaround
diff -rN -u old-ghc/rules new-ghc/rules
--- old-ghc/rules	2011-03-23 07:54:55.684130448 +0000
+++ new-ghc/rules	2011-03-23 07:54:55.712131924 +0000
@@ -38,7 +38,7 @@
 	touch configure
 
 	rm -f mk/build.mk
-	echo "SRC_HC_OPTS += -lffi" >> mk/build.mk
+	echo "SRC_HC_OPTS += -lffi -optl-pthread" >> mk/build.mk
 	echo "HADDOCK_DOCS := YES" >> mk/build.mk
 	echo "XSLTPROC_OPTS += --nonet" >> mk/build.mk
 ifneq (,$(findstring $(DEB_HOST_ARCH), i386 amd64 kfreebsd-i386 kfreebsd-amd64 powerpc))