diff options
author | androidbuilder <androidbuilder@example.com> | 2015-08-02 19:48:36 +0000 |
---|---|---|
committer | androidbuilder <androidbuilder@example.com> | 2015-08-02 19:48:36 +0000 |
commit | d03dd472b7f987695489f01d52cedb8b16e5b6c1 (patch) | |
tree | c5f5d0bd8a6a68476fc4cc6616170e8545d51791 /standalone/no-th/haskell-patches/vector_hack-to-build-with-new-ghc.patch | |
parent | f37922856e7ac2ad535f8da11dc291f485e22b98 (diff) |
reverted updates to new lib versions that broke android build
I ran into several evilsplicer problems with the new lib versions, most notably including a problem with encoding of embedded binary files
Diffstat (limited to 'standalone/no-th/haskell-patches/vector_hack-to-build-with-new-ghc.patch')
-rw-r--r-- | standalone/no-th/haskell-patches/vector_hack-to-build-with-new-ghc.patch | 49 |
1 files changed, 49 insertions, 0 deletions
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 new file mode 100644 index 000000000..f89f0d60b --- /dev/null +++ b/standalone/no-th/haskell-patches/vector_hack-to-build-with-new-ghc.patch @@ -0,0 +1,49 @@ +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 + |