update vector patch; only needed for android cross build now
This commit is contained in:
parent
43f2acfd9e
commit
77cabc07ed
2 changed files with 24 additions and 49 deletions
24
standalone/android/haskell-patches/vector_cross-build.patch
Normal file
24
standalone/android/haskell-patches/vector_cross-build.patch
Normal file
|
@ -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
|
||||||
|
|
|
@ -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
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue