[Pkg-haskell-commits] darcs: ghc: fix upstream bug #1087 in current version

[Louis Bettens]

Fri Oct 11 22:25:55 UTC 2013  Louis Bettens <louis at bettens.info>
  * fix upstream bug #1087 in current version

    M ./changelog +4
    A ./patches/cabal-bug-1087.patch
    M ./patches/series +1

Fri Oct 11 22:25:55 UTC 2013  Louis Bettens <louis at bettens.info>
  * fix upstream bug #1087 in current version
diff -rN -u old-ghc/changelog new-ghc/changelog
--- old-ghc/changelog	2013-10-11 22:27:18.451284162 +0000
+++ new-ghc/changelog	2013-10-11 22:27:18.487267989 +0000
@@ -1,7 +1,11 @@
 ghc (7.6.3-5) UNRELEASED; urgency=low
 
+  [ Gianfranco Costamagna ]
   * Removing gcc from control file build-deps
 
+  [ Louis Bettens ]
+  * fix upstream bug #1087 in current version
+
  -- Gianfranco Costamagna <costamagnagianfranco at yahoo.it>  Wed, 28 Aug 2013 16:14:21 +0200
 
 ghc (7.6.3-4) unstable; urgency=low
diff -rN -u old-ghc/patches/cabal-bug-1087.patch new-ghc/patches/cabal-bug-1087.patch
--- old-ghc/patches/cabal-bug-1087.patch	1970-01-01 00:00:00.000000000 +0000
+++ new-ghc/patches/cabal-bug-1087.patch	2013-10-11 22:27:18.511198943 +0000
@@ -0,0 +1,22 @@
+Description: Fix bug in preprocessing test suites and benchmarks
+
+ Preprocessed files would be written to dist/build instead of
+ dist/build/my-test-suite/my-test-suite-tmp, causing them not to be
+ found during compilation.
+
+ Fixes #1087.
+Author: Johan Tibell <johan.tibell at gmail.com>
+Origin: https://github.com/haskell/cabal/commit/dd691fa6791d67981388ec044b28343879d8c2b1
+diff --git a/libraries/Cabal/Cabal/Distribution/Simple/PreProcess.hs b/libraries/Cabal/Cabal/Distribution/Simple/PreProcess.hs
+index 0c6cb3e..ad9df9f 100644
+--- a/libraries/Cabal/Cabal/Distribution/Simple/PreProcess.hs
++++ b/libraries/Cabal/Cabal/Distribution/Simple/PreProcess.hs
+@@ -232,7 +232,7 @@ preprocessComponent pd comp lbi isSrcDist verbosity handlers = case comp of
+     preProcessComponent bi modules exePath dir = do
+         let biHandlers = localHandlers bi
+             sourceDirs = hsSourceDirs bi ++ [ autogenModulesDir lbi ]
+-        sequence_ [ preprocessFile sourceDirs (buildDir lbi) isSrcDist
++        sequence_ [ preprocessFile sourceDirs dir isSrcDist
+                 (ModuleName.toFilePath modu) verbosity builtinSuffixes
+                 biHandlers
+                 | modu <- modules ]
diff -rN -u old-ghc/patches/series new-ghc/patches/series
--- old-ghc/patches/series	2013-10-11 22:27:18.431251822 +0000
+++ new-ghc/patches/series	2013-10-11 22:27:18.515055451 +0000
@@ -1,3 +1,4 @@
+cabal-bug-1087.patch
 system-libffi
 haddock-hardcode-ghc-paths
 use-debian-gen_contents_index