[kaya] Fix issue with findFile in Modules.hs
Jochen Schmitt
s4504kr at fedoraproject.org
Wed Aug 28 11:11:34 UTC 2013
commit 6564c4f0881989ac94dc4e453f2ecb1de1f3e956
Author: Jochen Schmitt <Jochen at herr-schmitt.de>
Date: Wed Aug 28 13:11:19 2013 +0200
Fix issue with findFile in Modules.hs
kaya-0.5.2-ghc76.patch | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
---
diff --git a/kaya-0.5.2-ghc76.patch b/kaya-0.5.2-ghc76.patch
index 7d21755..7f2fc98 100644
--- a/kaya-0.5.2-ghc76.patch
+++ b/kaya-0.5.2-ghc76.patch
@@ -1,6 +1,6 @@
diff -up kaya-0.5.2/compiler/CodegenCPP.hs.ghc76 kaya-0.5.2/compiler/CodegenCPP.hs
---- kaya-0.5.2/compiler/CodegenCPP.hs.ghc76 2013-08-28 12:41:20.246909977 +0200
-+++ kaya-0.5.2/compiler/CodegenCPP.hs 2013-08-28 12:41:20.251909648 +0200
+--- kaya-0.5.2/compiler/CodegenCPP.hs.ghc76 2013-08-28 13:03:27.541927023 +0200
++++ kaya-0.5.2/compiler/CodegenCPP.hs 2013-08-28 13:03:27.599923160 +0200
@@ -17,6 +17,8 @@ import Debug.Trace
import Lib
import Data.List
@@ -25,8 +25,8 @@ diff -up kaya-0.5.2/compiler/CodegenCPP.hs.ghc76 kaya-0.5.2/compiler/CodegenCPP.
writecpp :: [CompileResult] -> [Output]
writecpp [] = []
diff -up kaya-0.5.2/compiler/Driver.hs.ghc76 kaya-0.5.2/compiler/Driver.hs
---- kaya-0.5.2/compiler/Driver.hs.ghc76 2013-08-28 12:41:20.247909911 +0200
-+++ kaya-0.5.2/compiler/Driver.hs 2013-08-28 12:43:37.995853127 +0200
+--- kaya-0.5.2/compiler/Driver.hs.ghc76 2013-08-28 13:03:27.548926556 +0200
++++ kaya-0.5.2/compiler/Driver.hs 2013-08-28 13:03:27.601923027 +0200
@@ -37,6 +37,7 @@ import System.Random
import System.IO
import Debug.Trace
@@ -53,8 +53,8 @@ diff -up kaya-0.5.2/compiler/Driver.hs.ghc76 kaya-0.5.2/compiler/Driver.hs
outputfile Module mod = showuser mod ++ ".o"
-- TMP HACK: This should probably be a %extension "cgi" directive in the .ks
diff -up kaya-0.5.2/compiler/Module.hs.ghc76 kaya-0.5.2/compiler/Module.hs
---- kaya-0.5.2/compiler/Module.hs.ghc76 2013-08-28 12:41:20.248909845 +0200
-+++ kaya-0.5.2/compiler/Module.hs 2013-08-28 12:41:20.252909582 +0200
+--- kaya-0.5.2/compiler/Module.hs.ghc76 2013-08-28 13:03:27.567925291 +0200
++++ kaya-0.5.2/compiler/Module.hs 2013-08-28 13:06:30.214776403 +0200
@@ -14,8 +14,9 @@ module Module(importVersion, findFile, f
getAllLibDirs, linkFiles, getObjs) where
@@ -76,13 +76,13 @@ diff -up kaya-0.5.2/compiler/Module.hs.ghc76 kaya-0.5.2/compiler/Module.hs
f <- readFile (x++path)
return (Just f))
- (\e -> findFile xs path)
-+ (\ (e :: SomeException) -> findFile xs path)
++ (\ (e :: SomeException) -> Module.findFile xs path)
-- Get all the library directories, looking at the options and the
-- KAYA_LIBRARY_PATH environment variable.
diff -up kaya-0.5.2/compiler/Portability64.hs.ghc76 kaya-0.5.2/compiler/Portability64.hs
--- kaya-0.5.2/compiler/Portability64.hs.ghc76 2009-04-12 12:02:24.000000000 +0200
-+++ kaya-0.5.2/compiler/Portability64.hs 2013-08-28 12:41:20.252909582 +0200
++++ kaya-0.5.2/compiler/Portability64.hs 2013-08-28 13:03:27.607922628 +0200
@@ -5,12 +5,14 @@ import System.IO
import System.Environment
import qualified Data.Map as Map
@@ -102,8 +102,8 @@ diff -up kaya-0.5.2/compiler/Portability64.hs.ghc76 kaya-0.5.2/compiler/Portabil
tempfile :: IO (FilePath, Handle)
tempfile = do env <- environment "TMPDIR"
diff -up kaya-0.5.2/compiler/REPL.hs.in.ghc76 kaya-0.5.2/compiler/REPL.hs.in
---- kaya-0.5.2/compiler/REPL.hs.in.ghc76 2013-08-28 12:41:20.249909780 +0200
-+++ kaya-0.5.2/compiler/REPL.hs.in 2013-08-28 12:41:20.252909582 +0200
+--- kaya-0.5.2/compiler/REPL.hs.in.ghc76 2013-08-28 13:03:27.580924426 +0200
++++ kaya-0.5.2/compiler/REPL.hs.in 2013-08-28 13:03:27.610922428 +0200
@@ -35,6 +35,8 @@ import System.IO
import @readlinemodule@
import System.Directory
More information about the scm-commits
mailing list