diff options
author | 2011-08-01 20:36:09 +0000 | |
---|---|---|
committer | 2011-08-01 20:36:09 +0000 | |
commit | d9b0d6feb74f6a450ec42263963a103ea8858608 (patch) | |
tree | 99a6853965db309e418c7f86a6c6ceb1973f1a10 /dev-haskell/c2hs/files | |
parent | Removed old. (diff) | |
download | gentoo-2-d9b0d6feb74f6a450ec42263963a103ea8858608.tar.gz gentoo-2-d9b0d6feb74f6a450ec42263963a103ea8858608.tar.bz2 gentoo-2-d9b0d6feb74f6a450ec42263963a103ea8858608.zip |
Removed old.
(Portage version: 2.1.10.7/cvs/Linux x86_64)
Diffstat (limited to 'dev-haskell/c2hs/files')
-rw-r--r-- | dev-haskell/c2hs/files/c2hs-0.14.5-ghc66.patch | 50 | ||||
-rw-r--r-- | dev-haskell/c2hs/files/ghc622inc.patch | 9 | ||||
-rw-r--r-- | dev-haskell/c2hs/files/setupfix.patch | 19 |
3 files changed, 0 insertions, 78 deletions
diff --git a/dev-haskell/c2hs/files/c2hs-0.14.5-ghc66.patch b/dev-haskell/c2hs/files/c2hs-0.14.5-ghc66.patch deleted file mode 100644 index 4662e70cb57f..000000000000 --- a/dev-haskell/c2hs/files/c2hs-0.14.5-ghc66.patch +++ /dev/null @@ -1,50 +0,0 @@ -diff -urwpN c2hs-0.14.5.orig/c2hs/c/CLexer.hs c2hs-0.14.5/c2hs/c/CLexer.hs ---- c2hs-0.14.5.orig/c2hs/c/CLexer.hs 2005-08-07 14:01:44.000000000 +0100 -+++ c2hs-0.14.5/c2hs/c/CLexer.hs 2006-09-12 10:15:00.000000000 +0100 -@@ -13,7 +13,7 @@ import UNames (Name) - import Idents (Ident, lexemeToIdent, identToLexeme) - - import Data.Set (Set) --import qualified Data.Set as Set (mkSet, addToSet, elementOf) -+import qualified Data.Set as Set (fromList, insert, member) - - - #if __GLASGOW_HASKELL__ >= 603 -@@ -413,7 +413,7 @@ idkwtok cs = \pos -> do - name <- getNewName - tdefs <- getTypedefs - let ident = lexemeToIdent pos cs name -- if ident `Set.elementOf` tdefs -+ if ident `Set.member` tdefs - then return (CTokTyIdent pos ident) - else return (CTokIdent pos ident) - -@@ -526,7 +526,7 @@ execParser (P parser) input pos builtins - alex_inp = input, - alex_last = interr "CLexer.execParser: Touched undefined token!", - alex_names = names, -- alex_tdefs = Set.mkSet builtins -+ alex_tdefs = Set.fromList builtins - } - - {-# INLINE returnP #-} -@@ -571,7 +571,7 @@ getTypedefs = P $ \s@PState{alex_tdefs=t - - addTypedef :: Ident -> P () - addTypedef ident = (P $ \s@PState{alex_tdefs=tdefs} -> -- POk s{alex_tdefs = tdefs `Set.addToSet` ident} ()) -+ POk s{alex_tdefs = Set.insert ident tdefs} ()) - - getInput :: P AlexInput - getInput = P $ \s@PState{alex_pos=p, alex_inp=i} -> POk s (p,i) -diff -urwpN c2hs-0.14.5.orig/c2hs/c/CParser.hs c2hs-0.14.5/c2hs/c/CParser.hs ---- c2hs-0.14.5.orig/c2hs/c/CParser.hs 2005-08-07 14:01:47.000000000 +0100 -+++ c2hs-0.14.5/c2hs/c/CParser.hs 2006-09-12 10:18:10.000000000 +0100 -@@ -5,7 +5,6 @@ import Monad (when) - import Maybe (catMaybes) - - import Common (Position, Pos(..), nopos) --import Data.Set (Set, mkSet, union, elementOf) - import Utils (Tag(tag)) - import UNames (Name, NameSupply, names) - import Idents (Ident) diff --git a/dev-haskell/c2hs/files/ghc622inc.patch b/dev-haskell/c2hs/files/ghc622inc.patch deleted file mode 100644 index e2030c6dc682..000000000000 --- a/dev-haskell/c2hs/files/ghc622inc.patch +++ /dev/null @@ -1,9 +0,0 @@ ---- c2hs-0.14.5.orig/c2hs.cabal 2006-02-18 18:12:23.000000000 +0000 -+++ c2hs-0.14.5/c2hs.cabal 2006-02-18 13:32:47.000000000 +0000 -@@ -76,5 +76,5 @@ - C2HSConfig - Version - Extensions: ForeignFunctionInterface --Ghc-Options: -O -+Ghc-Options: -O -Ic2hs/toplevel - C-Sources: c2hs/toplevel/c2hs_config.c diff --git a/dev-haskell/c2hs/files/setupfix.patch b/dev-haskell/c2hs/files/setupfix.patch deleted file mode 100644 index 6e70a8253e8a..000000000000 --- a/dev-haskell/c2hs/files/setupfix.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- Setup.hs 2005-07-14 09:58:25.000000000 +0200 -+++ Setup.hs 2005-07-28 19:06:11.000000000 +0200 -@@ -8,15 +8,5 @@ - import Distribution.Setup - import Distribution.Simple.LocalBuildInfo - --main = defaultMainWithHooks defaultUserHooks {postInst = addWrapperAndLib} -+main = defaultMainWithHooks defaultUserHooks - ---- Install the c2hs shell script wrapper that passes the --data options as ---- well as the `C2HS' library module. ---- ---- * We need to do this via a shell script that has been munged by ./configure, ---- as Cabal doesn't give us enough info (eg, no package name and version) to ---- do it all in Haskell. ---- --addWrapperAndLib :: Args -> InstallFlags -> LocalBuildInfo -> IO ExitCode --addWrapperAndLib _ _ _ = -- system "./postInst.sh" |