Attachment 309313 Details for Bug 451394 – hsql-mysql.Setup.lhs.patch

[patch] hsql-mysql.Setup.lhs.patch

hsql-mysql.Setup.lhs.patch (text/plain), 2.08 KB, created by Rajesh Krishnan on 2008-06-14 01:02:29 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Rajesh Krishnan

Created: 2008-06-14 01:02:29 UTC

Size: 2.08 KB

patch

obsolete

>--- Setup.orig.lhs	2007-04-09 12:48:02.000000000 -0700
>+++ Setup.lhs	2008-06-13 05:25:48.000000000 -0700
>@@ -3,10 +3,10 @@
> \begin{code}
> import Data.Maybe(fromMaybe)
> import Distribution.PackageDescription
>-import Distribution.Setup
>+import Distribution.Simple.Setup
> import Distribution.Simple
> import Distribution.Simple.LocalBuildInfo
>-import Distribution.Simple.Utils(rawSystemVerbose)
>+import Distribution.Verbosity
> import System.Info
> import System.Exit
> import System.Directory
>@@ -21,13 +21,13 @@
>     preConf args flags = do
>       try (removeFile "MySQL.buildinfo")
>       return emptyHookedBuildInfo
>-    postConf :: [String] -> ConfigFlags -> PackageDescription -> LocalBuildInfo -> IO ExitCode
>+    postConf :: [String] -> ConfigFlags -> PackageDescription -> LocalBuildInfo -> IO ()
>     postConf args flags _ localbuildinfo = do
>       mb_bi <- mysqlConfigBuildInfo (configVerbose flags)
>       let default_binfo | os == "mingw32" = emptyBuildInfo{extraLibs=["libmySQL"], ccOptions=["-Dmingw32_HOST_OS"]}
>                         | otherwise       = emptyBuildInfo{extraLibs=["mysqlclient"]}
>       writeHookedBuildInfo "MySQL.buildinfo" (Just (fromMaybe default_binfo mb_bi),[])
>-      return ExitSuccess
>+      return ()
> \end{code}
> 
> The following code is derived from Distribution.Simple.Configure
>@@ -46,9 +46,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 +67,7 @@
> 
> Populate BuildInfo using pkg-config tool.
> \begin{code}
>-mysqlConfigBuildInfo :: Int -> IO (Maybe BuildInfo)
>+mysqlConfigBuildInfo :: Verbosity -> IO (Maybe BuildInfo)
> mysqlConfigBuildInfo verbose = do
>   mb_mysql_config_path <- findProgram "mysql_config" Nothing
>   case mb_mysql_config_path of

Actions: View | Diff

Attachments on bug 451394: 309311 | 309312 | 309313