llvm-general 3.3.13.2 → 3.3.13.3

raw patch · 2 files changed

+20/−6 lines, 2 filesdep ~llvm-generalsetup-changed

Dependency ranges changed: llvm-general

Files

• Setup.hs +17/−3
• llvm-general.cabal +3/−3

@@ -48,6 +48,21 @@ instance Monad m => ProgramSearch (v -> p -> m (Maybe b)) where   programSearch checkName = \v p -> findJustBy (\n -> checkName n v p) llvmConfigNames +class OldHookable hook where+  preHookOld :: (PackageDescription -> LocalBuildInfo -> UserHooks -> TestFlags -> IO ()) -> hook -> hook++-- this instance is used before Cabal-1.22.0.0, when testHook took four arguments+instance OldHookable (PackageDescription -> LocalBuildInfo -> UserHooks -> TestFlags -> IO ()) where+  preHookOld f hook = \packageDescription localBuildInfo userHooks testFlags -> do+    f packageDescription localBuildInfo userHooks testFlags+    hook packageDescription localBuildInfo userHooks testFlags++-- this instance is used for and after Cabal-1.22.0.0, when testHook took four five arguments+instance OldHookable (Args -> PackageDescription -> LocalBuildInfo -> UserHooks -> TestFlags -> IO ()) where+  preHookOld f hook = \args packageDescription localBuildInfo userHooks testFlags -> do+    f packageDescription localBuildInfo userHooks testFlags+    hook args packageDescription localBuildInfo userHooks testFlags+ llvmProgram = (simpleProgram "llvm-config") {   programFindLocation = programSearch (programFindLocation . simpleProgram),   programFindVersion = @@ -125,9 +140,8 @@       addLLVMToLdLibraryPath (configFlags localBuildInfo)       buildHook simpleUserHooks packageDescription localBuildInfo userHooks buildFlags, -    testHook = \packageDescription localBuildInfo userHooks testFlags -> do-      addLLVMToLdLibraryPath (configFlags localBuildInfo)-      testHook simpleUserHooks packageDescription localBuildInfo userHooks testFlags,+    testHook = preHookOld (\_ localBuildInfo _ _ -> addLLVMToLdLibraryPath (configFlags localBuildInfo))+               (testHook simpleUserHooks),      haddockHook = \packageDescription localBuildInfo userHooks haddockFlags -> do        let v = "GHCRTS"

@@ -1,5 +1,5 @@ name: llvm-general-version: 3.3.13.2+version: 3.3.13.3 license: BSD3 license-file: LICENSE author: Benjamin S.Scarlet <fgthb0@greynode.net>@@ -38,7 +38,7 @@   type: git   location: git://github.com/bscarlet/llvm-general.git   branch: llvm-3.3-  tag: v3.3.13.2+  tag: v3.3.13.3  flag shared-llvm   description: link against llvm shared rather than static library@@ -203,7 +203,7 @@     HUnit >= 1.2.4.2,     test-framework-quickcheck2 >= 0.3.0.1,     QuickCheck >= 2.5.1.1,-    llvm-general == 3.3.13.2,+    llvm-general == 3.3.13.3,     llvm-general-pure == 3.3.13.1,     containers >= 0.4.2.1,     mtl >= 2.1,