diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2015-07-02 16:50:26 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-07-02 16:50:26 -0400 |
| commit | 957526da9849e5b8e7f8e050d65b9f63141636c0 (patch) | |
| tree | f964e41f695a7d8d2bedd368662b8934582ae362 /standalone | |
| parent | 4292372e5f82d682a9df208947cdff877d5b995b (diff) | |
update vector patch; only needed for android cross build now
Diffstat (limited to 'standalone')
| -rw-r--r-- | standalone/android/haskell-patches/vector_cross-build.patch | 24 | ||||
| -rw-r--r-- | standalone/no-th/haskell-patches/vector_hack-to-build-with-new-ghc.patch | 49 |
2 files changed, 24 insertions, 49 deletions
diff --git a/standalone/android/haskell-patches/vector_cross-build.patch b/standalone/android/haskell-patches/vector_cross-build.patch new file mode 100644 index 000000000..2abc30599 --- /dev/null +++ b/standalone/android/haskell-patches/vector_cross-build.patch @@ -0,0 +1,24 @@ +From 6ffd4fcb7d27ec6df709d80a40a262406446a259 Mon Sep 17 00:00:00 2001 +From: dummy <dummy@example.com> +Date: Wed, 15 Oct 2014 17:00:56 +0000 +Subject: [PATCH] cross build + +--- + Data/Vector/Fusion/Stream/Monadic.hs | 1 - + 2 files changed, 14 deletions(-) + +diff --git a/Data/Vector/Fusion/Stream/Monadic.hs b/Data/Vector/Fusion/Stream/Monadic.hs +index 51fec75..b089b3d 100644 +--- a/Data/Vector/Fusion/Stream/Monadic.hs ++++ b/Data/Vector/Fusion/Stream/Monadic.hs +@@ -101,7 +101,6 @@ import GHC.Exts ( SpecConstrAnnotation(..) ) + + data SPEC = SPEC | SPEC2 + #if __GLASGOW_HASKELL__ >= 700 +-{-# ANN type SPEC ForceSpecConstr #-} + #endif + + emptyStream :: String +-- +2.1.1 + diff --git a/standalone/no-th/haskell-patches/vector_hack-to-build-with-new-ghc.patch b/standalone/no-th/haskell-patches/vector_hack-to-build-with-new-ghc.patch deleted file mode 100644 index f89f0d60b..000000000 --- a/standalone/no-th/haskell-patches/vector_hack-to-build-with-new-ghc.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 6ffd4fcb7d27ec6df709d80a40a262406446a259 Mon Sep 17 00:00:00 2001 -From: dummy <dummy@example.com> -Date: Wed, 15 Oct 2014 17:00:56 +0000 -Subject: [PATCH] cross build - ---- - Data/Vector/Fusion/Stream/Monadic.hs | 1 - - Data/Vector/Unboxed/Base.hs | 13 ------------- - 2 files changed, 14 deletions(-) - -diff --git a/Data/Vector/Fusion/Stream/Monadic.hs b/Data/Vector/Fusion/Stream/Monadic.hs -index 51fec75..b089b3d 100644 ---- a/Data/Vector/Fusion/Stream/Monadic.hs -+++ b/Data/Vector/Fusion/Stream/Monadic.hs -@@ -101,7 +101,6 @@ import GHC.Exts ( SpecConstrAnnotation(..) ) - - data SPEC = SPEC | SPEC2 - #if __GLASGOW_HASKELL__ >= 700 --{-# ANN type SPEC ForceSpecConstr #-} - #endif - - emptyStream :: String -diff --git a/Data/Vector/Unboxed/Base.hs b/Data/Vector/Unboxed/Base.hs -index 00350cb..34bfc4a 100644 ---- a/Data/Vector/Unboxed/Base.hs -+++ b/Data/Vector/Unboxed/Base.hs -@@ -65,19 +65,6 @@ vectorTyCon = mkTyCon3 "vector" - vectorTyCon m s = mkTyCon $ m ++ "." ++ s - #endif - --instance Typeable1 Vector where -- typeOf1 _ = mkTyConApp (vectorTyCon "Data.Vector.Unboxed" "Vector") [] -- --instance Typeable2 MVector where -- typeOf2 _ = mkTyConApp (vectorTyCon "Data.Vector.Unboxed.Mutable" "MVector") [] -- --instance (Data a, Unbox a) => Data (Vector a) where -- gfoldl = G.gfoldl -- toConstr _ = error "toConstr" -- gunfold _ _ = error "gunfold" -- dataTypeOf _ = G.mkType "Data.Vector.Unboxed.Vector" -- dataCast1 = G.dataCast -- - -- ---- - -- Unit - -- ---- --- -2.1.1 - |