diff options
| author |   Andres Loeh <kosmikus@gentoo.org> | 2004-10-21 15:15:43 +0000 |
|---|---|---|
| committer | Andres Loeh <kosmikus@gentoo.org> | 2004-10-21 15:15:43 +0000 |
| commit | d1ab21c6a3ae70679b74f84a47cc56e55977db71 (patch) | |
| tree | 7ad63cbaf25b06cdcd01a35f4dd6a695e9692df5 /dev-haskell/happy/files | |
| parent | install build_icon.sh #68399 by chico76 (diff) | |
| download | historical-d1ab21c6a3ae70679b74f84a47cc56e55977db71.tar.gz historical-d1ab21c6a3ae70679b74f84a47cc56e55977db71.tar.bz2 historical-d1ab21c6a3ae70679b74f84a47cc56e55977db71.zip | |
patched for gcc-3.4
Diffstat (limited to 'dev-haskell/happy/files')
| -rw-r--r-- | dev-haskell/happy/files/digest-happy-1.13 | 1 | ||||
| -rw-r--r-- | dev-haskell/happy/files/happy-1.13-pragma.patch.bz2 | bin | 498 -> 0 bytes | |||
| -rw-r--r-- | dev-haskell/happy/files/happy-1.14-gcc3.4.patch | 49 |
3 files changed, 49 insertions, 1 deletions
diff --git a/dev-haskell/happy/files/digest-happy-1.13 b/dev-haskell/happy/files/digest-happy-1.13 deleted file mode 100644 index 60877aeeae3a..000000000000 --- a/dev-haskell/happy/files/digest-happy-1.13 +++ /dev/null @@ -1 +0,0 @@ -MD5 d17619ae6e2caf883651d88be38dfd8a happy-1.13-src.tar.gz 329764 diff --git a/dev-haskell/happy/files/happy-1.13-pragma.patch.bz2 b/dev-haskell/happy/files/happy-1.13-pragma.patch.bz2 Binary files differdeleted file mode 100644 index bdf01f960e43..000000000000 --- a/dev-haskell/happy/files/happy-1.13-pragma.patch.bz2 +++ /dev/null diff --git a/dev-haskell/happy/files/happy-1.14-gcc3.4.patch b/dev-haskell/happy/files/happy-1.14-gcc3.4.patch new file mode 100644 index 000000000000..0dd915cb77f3 --- /dev/null +++ b/dev-haskell/happy/files/happy-1.14-gcc3.4.patch @@ -0,0 +1,49 @@ +diff -Naur happy-1.14.orig/happy/src/Main.lhs happy-1.14/happy/src/Main.lhs +--- happy-1.14.orig/happy/src/Main.lhs 2004-10-21 17:03:27.923088968 +0200 ++++ happy-1.14/happy/src/Main.lhs 2004-10-21 17:03:55.192943320 +0200 +@@ -417,20 +417,11 @@ + + CPP is turned on for -fglasogw-exts, so we can use conditional compilation: + +-> import_glaexts = "#if __GLASGOW_HASKELL__ >= 503\n\ +-> \import GHC.Exts\n\ +-> \#else\n\ +-> \import GlaExts\n\ +-> \#endif\n" +- +-> import_debug = "#if __GLASGOW_HASKELL__ >= 503\n\ +-> \import System.IO\n\ +-> \import System.IO.Unsafe\n\ +-> \import Debug.Trace\n\ +-> \#else\n\ +-> \import IO\n\ +-> \import IOExts\n\ +-> \#endif\n" ++> import_glaexts = ++> "#if __GLASGOW_HASKELL__ >= 503\nimport GHC.Exts\n#else\nimport GlaExts\n#endif\n" ++ ++> import_debug = ++> "#if __GLASGOW_HASKELL__ >= 503\nimport System.IO\nimport System.IO.Unsafe\nimport Debug.Trace\n#else\nimport IO\nimport IOExts\n#endif\n" + + ------------------------------------------------------------------------------ + Extract various command-line options. +@@ -468,8 +459,8 @@ + > = if OptUseCoercions `elem` cli + > then if OptGhcTarget `elem` cli + > then return True +-> else dieHappy "-c/--coerce may only be used \ +-> \in conjunction with -g/--ghc\n" ++> else dieHappy ++> "-c/--coerce may only be used in conjunction with -g/--ghc\n" + > else return False + + > getGhc cli = return (OptGhcTarget `elem` cli) +diff -Naur happy-1.14.orig/happy/src/Version.hs happy-1.14/happy/src/Version.hs +--- happy-1.14.orig/happy/src/Version.hs 2004-10-21 17:03:27.929088056 +0200 ++++ happy-1.14/happy/src/Version.hs 2004-10-21 17:03:44.131624896 +0200 +@@ -1,4 +1,3 @@ + module Version (version) where + +-version = tail "\ +- \ HAPPY_VERSION" ++version = "1.14" |