[kaya] Hiding findfile to fix FTBFS
Jochen Schmitt
s4504kr at fedoraproject.org
Tue Aug 27 16:49:29 UTC 2013
commit 814186ebf0f2a76911c9516ea0265b984f233d70
Author: Jochen Schmitt <Jochen at herr-schmitt.de>
Date: Tue Aug 27 18:49:13 2013 +0200
Hiding findfile to fix FTBFS
kaya-0.5.2-catch.patch | 14 --------------
kaya-0.5.2-ghc76.patch | 26 ++++++++++++++++++++++++++
kaya.spec | 5 +++--
3 files changed, 29 insertions(+), 16 deletions(-)
---
diff --git a/kaya-0.5.2-ghc76.patch b/kaya-0.5.2-ghc76.patch
new file mode 100644
index 0000000..9853a1c
--- /dev/null
+++ b/kaya-0.5.2-ghc76.patch
@@ -0,0 +1,26 @@
+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-27 18:41:59.301116309 +0200
++++ kaya-0.5.2/compiler/Module.hs 2013-08-27 18:44:44.192888238 +0200
+@@ -15,7 +15,7 @@ module Module(importVersion, findFile, f
+
+ import Language
+ import Debug.Trace
+-import System.Directory
++import System.Directory hiding (findfile)
+ import Data.List
+ import Lib
+ import Options
+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-27 18:40:37.891683927 +0200
+@@ -8,9 +8,7 @@ import qualified Data.Map as Map
+ -- GHC 6.4 and above library incompatibilities.
+
+ environment :: String -> IO (Maybe String)
+-environment x = catch (do e <- getEnv x
+- return (Just e))
+- (\_ -> return Nothing)
++environment = lookupEnv
+
+ tempfile :: IO (FilePath, Handle)
+ tempfile = do env <- environment "TMPDIR"
diff --git a/kaya.spec b/kaya.spec
index 37e4b66..d1b07fd 100644
--- a/kaya.spec
+++ b/kaya.spec
@@ -22,7 +22,7 @@ Patch4: kaya-0.5.2-dyn.patch
Patch5: kaya-0.5.2-codegen.patch
Patch6: kaya-0.5.2-gcc47.patch
Patch7: kaya-0.5.2-ghc74-base.patch
-Patch8: kaya-0.5.2-catch.patch
+Patch8: kaya-0.5.2-ghc76.patch
ExcludeArch: sparc64
@@ -82,7 +82,7 @@ Additional you may find samples for this language.
%patch7 -p1 -b .haskell98
%if 0%{?fedora} > 19
-%patch8 -p1 -b .catch
+%patch8 -p1 -b .ghc76
%endif
%build
@@ -130,6 +130,7 @@ make test ||:
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
- Remove -fstack-protector-stong, Fix BZ #995626
- Use of System.Environment.lookupEnv to fix FTBFS
+- hinding findfile from System.Directory to fix FTBFS
* Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.2-18
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
More information about the scm-commits
mailing list