Attachment 309319 Details for Bug 451398 – ghc-hsql-postgresql.Setup.lhs.patch

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

ghc-hsql-postgresql.Setup.lhs.patch (text/plain), 1.90 KB, created by Rajesh Krishnan on 2008-06-14 02:43:42 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Rajesh Krishnan

Created: 2008-06-14 02:43:42 UTC

Size: 1.90 KB

patch

obsolete

>--- Setup.orig.lhs	2007-04-09 11:49:47.000000000 -0700
>+++ Setup.lhs	2008-06-13 19:26:42.000000000 -0700
>@@ -3,10 +3,11 @@
> \begin{code}
> import Data.Maybe(fromMaybe)
> import Distribution.PackageDescription
>-import Distribution.Setup
>+import Distribution.Simple.Setup
>+import Distribution.Verbosity
> 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
>@@ -21,11 +22,11 @@
>     preConf args flags = do
>       try (removeFile "PostgreSQL.buildinfo")
>       return emptyHookedBuildInfo
>-    postConf :: [String] -> ConfigFlags -> PackageDescription -> LocalBuildInfo -> IO ExitCode
>+    postConf :: [String] -> ConfigFlags -> PackageDescription -> LocalBuildInfo -> IO ()
>     postConf args flags _ localbuildinfo = do
>       mb_bi <- pqConfigBuildInfo (configVerbose flags)
>       writeHookedBuildInfo "PostgreSQL.buildinfo" (Just (fromMaybe emptyBuildInfo mb_bi),[])
>-      return ExitSuccess
>+      return ()
> \end{code}
> 
> The following code is derived from Distribution.Simple.Configure
>@@ -44,9 +45,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
>@@ -65,7 +66,7 @@
> 
> Populate BuildInfo using pkg-config tool.
> \begin{code}
>-pqConfigBuildInfo :: Int -> IO (Maybe BuildInfo)
>+pqConfigBuildInfo :: Verbosity -> IO (Maybe BuildInfo)
> pqConfigBuildInfo verbose = do
>   mb_pq_config_path <- findProgram "pg_config" Nothing
>   case mb_pq_config_path of

Actions: View | Diff

Attachments on bug 451398: 309317 | 309318 | 309319