ccef06da41
Was able to reuse many of the android patches, but several had to be re-done. On Android, ghc is a stage2 build, so can compile, but not run TH code. But debian's ghc on armel cannot even compile TH code, so it has to be patched out. Some haskell packages have been updated to new versions, including yesod and DAV, and their patches had to be redone. The Makefile now has 2 new targets. The first is run on a companion x86 system to do the build and get TH splices. Then the second target is run the same source tree on the arm system to build without needing TH. This commit was sponsored by Svenne Krap.
41 lines
1.4 KiB
Diff
41 lines
1.4 KiB
Diff
From efd18199fa245e51e6137036062ded8b0b26f78c Mon Sep 17 00:00:00 2001
|
|
From: dummy <dummy@example.com>
|
|
Date: Tue, 17 Dec 2013 18:08:22 +0000
|
|
Subject: [PATCH] disable TH
|
|
|
|
---
|
|
Database/Persist/Sql/Raw.hs | 4 +---
|
|
1 file changed, 1 insertion(+), 3 deletions(-)
|
|
|
|
diff --git a/Database/Persist/Sql/Raw.hs b/Database/Persist/Sql/Raw.hs
|
|
index 73189dd..d432790 100644
|
|
--- a/Database/Persist/Sql/Raw.hs
|
|
+++ b/Database/Persist/Sql/Raw.hs
|
|
@@ -11,7 +11,7 @@ import Data.IORef (writeIORef, readIORef, newIORef)
|
|
import Control.Exception (throwIO)
|
|
import Control.Monad (when, liftM)
|
|
import Data.Text (Text, pack)
|
|
-import Control.Monad.Logger (logDebugS)
|
|
+--import Control.Monad.Logger (logDebugS)
|
|
import Data.Int (Int64)
|
|
import Control.Monad.Trans.Class (lift)
|
|
import qualified Data.Text as T
|
|
@@ -22,7 +22,6 @@ rawQuery :: (MonadSqlPersist m, MonadResource m)
|
|
-> [PersistValue]
|
|
-> Source m [PersistValue]
|
|
rawQuery sql vals = do
|
|
- lift $ $logDebugS (pack "SQL") $ pack $ show sql ++ " " ++ show vals
|
|
conn <- lift askSqlConn
|
|
bracketP
|
|
(getStmtConn conn sql)
|
|
@@ -34,7 +33,6 @@ rawExecute x y = liftM (const ()) $ rawExecuteCount x y
|
|
|
|
rawExecuteCount :: MonadSqlPersist m => Text -> [PersistValue] -> m Int64
|
|
rawExecuteCount sql vals = do
|
|
- $logDebugS (pack "SQL") $ pack $ show sql ++ " " ++ show vals
|
|
stmt <- getStmt sql
|
|
res <- liftIO $ stmtExecute stmt vals
|
|
liftIO $ stmtReset stmt
|
|
--
|
|
1.8.5.1
|
|
|