[Pkg-haskell-commits] darcs: ghc: Drop patches/lpthread-bootstrap-workaround, probably not needed any more. Also drop autoconf dependency.

[Joachim Breitner]

Thu Dec 22 22:29:34 UTC 2011  Joachim Breitner <mail at joachim-breitner.de>
  * Drop patches/lpthread-bootstrap-workaround, probably not needed any more. Also drop autoconf dependency.
  Ignore-this: 7de4bd5af950008a0ef7c3dc89b12016

    M ./changelog +2
    M ./control -1
    R ./patches/lpthread-bootstrap-workaround
    M ./patches/series -1
    M ./rules -3

Thu Dec 22 22:29:34 UTC 2011  Joachim Breitner <mail at joachim-breitner.de>
  * Drop patches/lpthread-bootstrap-workaround, probably not needed any more. Also drop autoconf dependency.
  Ignore-this: 7de4bd5af950008a0ef7c3dc89b12016
diff -rN -u old-ghc//changelog new-ghc//changelog
--- old-ghc//changelog	2012-02-03 16:44:22.767249469 +0000
+++ new-ghc//changelog	2012-02-03 16:44:23.883247232 +0000
@@ -2,6 +2,8 @@
 
   * Fix building bundeled haddock out-of-tree (We need to re-think this
     approach).
+  * Drop patches/lpthread-bootstrap-workaround, probably not needed any
+    more. Also drop autoconf dependency.
 
  -- Joachim Breitner <nomeata at debian.org>  Thu, 22 Dec 2011 21:31:44 +0100
 
diff -rN -u old-ghc//control new-ghc//control
--- old-ghc//control	2012-02-03 16:44:22.767249469 +0000
+++ new-ghc//control	2012-02-03 16:44:23.839248294 +0000
@@ -11,7 +11,6 @@
   ghc,
   grep-dctrl,
   autotools-dev,
-  autoconf,
   gcc (>= 4:4.2),
   libffi-dev,
   pkg-config,
diff -rN -u old-ghc//patches/lpthread-bootstrap-workaround new-ghc//patches/lpthread-bootstrap-workaround
--- old-ghc//patches/lpthread-bootstrap-workaround	2012-02-03 16:44:22.763248305 +0000
+++ new-ghc//patches/lpthread-bootstrap-workaround	1970-01-01 00:00:00.000000000 +0000
@@ -1,13 +0,0 @@
-Index: ghc-7.4.0.20111219/aclocal.m4
-===================================================================
---- ghc-7.4.0.20111219.orig/aclocal.m4	2011-12-19 19:11:04.000000000 +0100
-+++ ghc-7.4.0.20111219/aclocal.m4	2011-12-21 19:52:18.000000000 +0100
-@@ -1738,7 +1738,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	2012-02-03 16:44:22.763248305 +0000
+++ new-ghc//patches/series	2012-02-03 16:44:23.835248150 +0000
@@ -2,5 +2,4 @@
 haddock-hardcode-ghc-paths
 use-debian-gen_contents_index
 haddock-no-library
-lpthread-bootstrap-workaround
 no_ghci_on_powerpc
diff -rN -u old-ghc//rules new-ghc//rules
--- old-ghc//rules	2012-02-03 16:44:22.735249582 +0000
+++ new-ghc//rules	2012-02-03 16:44:23.843383117 +0000
@@ -40,8 +40,6 @@
 configure-stamp:
 	dh_testdir
 
-	autoconf
-
 	rm -f mk/build.mk
 	echo "SRC_HC_OPTS += -lffi -optl-pthread" >> mk/build.mk
 	echo "HADDOCK_DOCS := YES" >> mk/build.mk
@@ -255,7 +253,6 @@
 	dh_testdir
 	dh_testroot
 	rm -f configure-stamp build-stamp install-stamp binary-arch-stamp binary-indep-stamp
-	rm -f configure
 
 	$(MAKE) distclean
 	rm -f config.sub config.guess