Attachment 309322 Details for Bug 451400 – ghc-hsql-sqlite3.Setup.lhs.patch

[patch] ghc-hsql-sqlite3.Setup.lhs.patch

ghc-hsql-sqlite3.Setup.lhs.patch (text/plain), 2.01 KB, created by Rajesh Krishnan on 2008-06-14 03:15:12 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Rajesh Krishnan

Created: 2008-06-14 03:15:12 UTC

Size: 2.01 KB

patch

obsolete

>--- Setup.orig.lhs	2007-04-09 11:53:41.000000000 -0700
>+++ Setup.lhs	2008-06-13 20:02:33.000000000 -0700
>@@ -2,10 +2,11 @@
> 
> \begin{code}
> import Distribution.PackageDescription
>-import Distribution.Setup
>+import Distribution.Verbosity
>+import Distribution.Simple.Setup
> import Distribution.Simple
> import Distribution.Simple.LocalBuildInfo
>-import Distribution.Simple.Utils(rawSystemVerbose)
>+import Distribution.Simple.Utils
> import System.Info
> import System.Exit
> import System.Directory
>@@ -20,14 +21,14 @@
>     preConf args flags = do
>       try (removeFile "SQLite3.buildinfo")
>       return emptyHookedBuildInfo
>-    postConf :: [String] -> ConfigFlags -> PackageDescription -> LocalBuildInfo -> IO ExitCode
>+    postConf :: [String] -> ConfigFlags -> PackageDescription -> LocalBuildInfo -> IO ()
>     postConf args flags _ localbuildinfo = do
>       mb_bi <- pkgConfigBuildInfo (configVerbose flags) "sqlite3"
>       let bi = case mb_bi of
>                  Just bi -> bi
>                  Nothing -> emptyBuildInfo{extraLibs=["sqlite3"]}
>       writeHookedBuildInfo "SQLite3.buildinfo" (Just bi,[])
>-      return ExitSuccess
>+      return ()
> \end{code}
> 
> The following code is derived from Distribution.Simple.Configure
>@@ -46,9 +47,9 @@
>   message ("Using " ++ name ++ ": " ++ path)
>   return (Just path)
> 
>-rawSystemGrabOutput :: Int -> FilePath -> [String] -> IO String
>+rawSystemGrabOutput :: Verbosity -> FilePath -> [String] -> IO String
> rawSystemGrabOutput verbose path args = do
>-  when (verbose > 0) $
>+  when (showForCabal verbose > "0") $
>         putStrLn (path ++ concatMap (' ':) args)
>   (inp,out,err,pid) <- runInteractiveProcess path args Nothing Nothing
>   exitCode <- waitForProcess pid
>@@ -67,7 +68,7 @@
> 
> Populate BuildInfo using pkg-config tool.
> \begin{code}
>-pkgConfigBuildInfo :: Int -> String -> IO (Maybe BuildInfo)
>+pkgConfigBuildInfo :: Verbosity -> String -> IO (Maybe BuildInfo)
> pkgConfigBuildInfo verbose pkgName = do
>   mb_pkg_config_path <- findProgram "pkg-config" Nothing
>   case mb_pkg_config_path of

Actions: View | Diff

Attachments on bug 451400: 309320 | 309321 | 309322 | 309323