| 1 |
kolmodin 10/03/30 22:22:53 |
| 2 |
|
| 3 |
Modified: haddock-2.4.2-Setup.hs |
| 4 |
Log: |
| 5 |
Patched dev-haskell/haddock-2.4.2 to work with both dev-haskell/cabal-1.6* and cabal-1.8*. |
| 6 |
(Portage version: 2.1.7.17/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.2 dev-haskell/haddock/files/haddock-2.4.2-Setup.hs |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-haskell/haddock/files/haddock-2.4.2-Setup.hs?rev=1.2&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-haskell/haddock/files/haddock-2.4.2-Setup.hs?rev=1.2&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-haskell/haddock/files/haddock-2.4.2-Setup.hs?r1=1.1&r2=1.2 |
| 14 |
|
| 15 |
Index: haddock-2.4.2-Setup.hs |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/dev-haskell/haddock/files/haddock-2.4.2-Setup.hs,v |
| 18 |
retrieving revision 1.1 |
| 19 |
retrieving revision 1.2 |
| 20 |
diff -u -r1.1 -r1.2 |
| 21 |
--- haddock-2.4.2-Setup.hs 6 May 2009 20:55:17 -0000 1.1 |
| 22 |
+++ haddock-2.4.2-Setup.hs 30 Mar 2010 22:22:53 -0000 1.2 |
| 23 |
@@ -1,6 +1,8 @@ |
| 24 |
{- |
| 25 |
Setup.hs: based on code from ghc-paths of Simon Marlow |
| 26 |
Fixed to not use the .buildinfo, and use -Dfoo flags for both libraries and executables |
| 27 |
+ |
| 28 |
+Modified 2010-03-30 to work with both cabal-1.6 and cabal-1.8. See bug #302489. |
| 29 |
-} |
| 30 |
import Distribution.Simple |
| 31 |
import Distribution.Simple.Setup |
| 32 |
@@ -20,12 +22,18 @@ |
| 33 |
confHook = myCustomConfHook |
| 34 |
} |
| 35 |
where |
| 36 |
+{- With cabal-1.6, myCustomConfHook has this type |
| 37 |
myCustomConfHook :: (Either GenericPackageDescription PackageDescription, HookedBuildInfo) |
| 38 |
-> ConfigFlags |
| 39 |
-> IO LocalBuildInfo |
| 40 |
- myCustomConfHook egpdpdhbi flags = do |
| 41 |
+ With cabal-1.8, myCustomConfHook has this type |
| 42 |
+ myCustomConfHook :: (GenericPackageDescription, HookedBuildInfo) |
| 43 |
+ |
| 44 |
+So, better to not specify the type at all as we're not required to... |
| 45 |
+-} |
| 46 |
+ myCustomConfHook gpd flags = do |
| 47 |
-- get the default LBI |
| 48 |
- lbi <- confHook simpleUserHooks egpdpdhbi flags |
| 49 |
+ lbi <- confHook simpleUserHooks gpd flags |
| 50 |
let programs = withPrograms lbi |
| 51 |
|
| 52 |
libdir_ <- rawSystemProgramStdoutConf (fromFlag (configVerbosity flags)) |
Archives