[Pkg-haskell-commits] darcs: ghc: Fix building bundeled haddock out-of-tree (We need to re-think this approach)

[Joachim Breitner]

Thu Dec 22 22:28:02 UTC 2011  Joachim Breitner <mail at joachim-breitner.de>
  * Fix building bundeled haddock out-of-tree (We need to re-think this approach)
  Ignore-this: 478f6651b8968bcdfc76b899b73adf53

    M ./changelog +7
    M ./patches/haddock-hardcode-ghc-paths -6 +17
    M ./patches/haddock-no-library -3 +3
    M ./rules +1

Thu Dec 22 22:28:02 UTC 2011  Joachim Breitner <mail at joachim-breitner.de>
  * Fix building bundeled haddock out-of-tree (We need to re-think this approach)
  Ignore-this: 478f6651b8968bcdfc76b899b73adf53
diff -rN -u old-ghc//changelog new-ghc//changelog
--- old-ghc//changelog	2012-02-03 16:44:20.111253683 +0000
+++ new-ghc//changelog	2012-02-03 16:44:21.191248244 +0000
@@ -1,3 +1,10 @@
+ghc (7.4.0.20111219-2) UNRELEASED; urgency=low
+
+  * Fix building bundeled haddock out-of-tree (We need to re-think this
+    approach).
+
+ -- Joachim Breitner <nomeata at debian.org>  Thu, 22 Dec 2011 21:31:44 +0100
+
 ghc (7.4.0.20111219-1) experimental; urgency=low
 
   * New upstream release (AKA 7.4.1-rc1)
diff -rN -u old-ghc//patches/haddock-hardcode-ghc-paths new-ghc//patches/haddock-hardcode-ghc-paths
--- old-ghc//patches/haddock-hardcode-ghc-paths	2012-02-03 16:44:20.107249745 +0000
+++ new-ghc//patches/haddock-hardcode-ghc-paths	2012-02-03 16:44:20.255248658 +0000
@@ -1,8 +1,19 @@
 Index: ghc-7.4.0.20111219/utils/haddock/haddock.cabal
 ===================================================================
---- ghc-7.4.0.20111219.orig/utils/haddock/haddock.cabal	2011-12-19 19:11:30.000000000 +0100
-+++ ghc-7.4.0.20111219/utils/haddock/haddock.cabal	2011-12-21 19:46:02.000000000 +0100
-@@ -95,8 +95,6 @@
+--- ghc-7.4.0.20111219.orig/utils/haddock/haddock.cabal	2011-12-22 16:18:59.000000000 +0100
++++ ghc-7.4.0.20111219/utils/haddock/haddock.cabal	2011-12-22 22:53:25.000000000 +0100
+@@ -78,10 +78,6 @@
+ 
+ executable haddock
+   default-language:     Haskell2010
+-  -- In a GHC tree - in particular, in a source tarball - we don't
+-  -- require alex or happy
+-  if !flag(in-ghc-tree)
+-    build-tools: alex >= 2.3, happy >= 1.18
+   build-depends:
+     base >= 4.3 && < 4.6,
+     filepath,
+@@ -95,8 +91,6 @@
  
    if flag(in-ghc-tree)
      cpp-options: -DIN_GHC_TREE
@@ -11,7 +22,7 @@
  
    if flag(test)
      cpp-options: -DTEST
-@@ -158,8 +156,6 @@
+@@ -158,8 +152,6 @@
  
    if flag(in-ghc-tree)
      cpp-options: -DIN_GHC_TREE
@@ -22,8 +33,8 @@
      cpp-options: -DTEST
 Index: ghc-7.4.0.20111219/utils/haddock/src/Main.hs
 ===================================================================
---- ghc-7.4.0.20111219.orig/utils/haddock/src/Main.hs	2011-12-19 19:11:30.000000000 +0100
-+++ ghc-7.4.0.20111219/utils/haddock/src/Main.hs	2011-12-21 19:50:41.000000000 +0100
+--- ghc-7.4.0.20111219.orig/utils/haddock/src/Main.hs	2011-12-22 16:18:59.000000000 +0100
++++ ghc-7.4.0.20111219/utils/haddock/src/Main.hs	2011-12-22 21:26:51.000000000 +0100
 @@ -50,7 +50,6 @@
  #ifdef IN_GHC_TREE
  import System.FilePath
diff -rN -u old-ghc//patches/haddock-no-library new-ghc//patches/haddock-no-library
--- old-ghc//patches/haddock-no-library	2012-02-03 16:44:20.059248547 +0000
+++ new-ghc//patches/haddock-no-library	2012-02-03 16:44:20.499248797 +0000
@@ -1,8 +1,8 @@
 Index: ghc-7.4.0.20111219/utils/haddock/haddock.cabal
 ===================================================================
---- ghc-7.4.0.20111219.orig/utils/haddock/haddock.cabal	2011-12-21 19:46:02.000000000 +0100
-+++ ghc-7.4.0.20111219/utils/haddock/haddock.cabal	2011-12-21 19:52:05.000000000 +0100
-@@ -136,74 +136,6 @@
+--- ghc-7.4.0.20111219.orig/utils/haddock/haddock.cabal	2011-12-22 22:55:26.000000000 +0100
++++ ghc-7.4.0.20111219/utils/haddock/haddock.cabal	2011-12-22 22:55:30.000000000 +0100
+@@ -132,74 +132,6 @@
      Haddock.Options
      Haddock.GhcUtils
      Haddock.Convert
diff -rN -u old-ghc//rules new-ghc//rules
--- old-ghc//rules	2012-02-03 16:44:20.059248547 +0000
+++ new-ghc//rules	2012-02-03 16:44:21.175248070 +0000
@@ -122,6 +122,7 @@
 	mkdir -p debian/haddock-build
 	cp -r utils/haddock debian/haddock-build
 	cd debian/haddock-build/haddock; \
+	        rm -rf dist; \
 		../../../inplace/bin/ghc-stage2 --make Setup.lhs; \
 		./Setup configure --prefix=/usr --with-compiler=../../../inplace/bin/ghc-stage2 \
 			--package-db=../../../inplace/lib/package.conf.d/ \