From 2670a0e89e81fe6cd941994912b38e6d0d261ced Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 10 Jun 2014 12:42:09 -0400 Subject: vector patch also needed for arm --- .../vector_hack-to-build-with-new-ghc.patch | 24 ---------------------- standalone/linux/install-haskell-packages | 1 + .../vector_hack-to-build-with-new-ghc.patch | 24 ++++++++++++++++++++++ 3 files changed, 25 insertions(+), 24 deletions(-) delete mode 100644 standalone/android/haskell-patches/vector_hack-to-build-with-new-ghc.patch create mode 100644 standalone/no-th/haskell-patches/vector_hack-to-build-with-new-ghc.patch (limited to 'standalone') diff --git a/standalone/android/haskell-patches/vector_hack-to-build-with-new-ghc.patch b/standalone/android/haskell-patches/vector_hack-to-build-with-new-ghc.patch deleted file mode 100644 index 4d39e91cf..000000000 --- a/standalone/android/haskell-patches/vector_hack-to-build-with-new-ghc.patch +++ /dev/null @@ -1,24 +0,0 @@ -From b0a79f4f98188ba5d43b7e3912b36d34d099ab65 Mon Sep 17 00:00:00 2001 -From: dummy -Date: Fri, 18 Oct 2013 23:20:35 +0000 -Subject: [PATCH] cross build - ---- - Data/Vector/Fusion/Stream/Monadic.hs | 1 - - 1 file changed, 1 deletion(-) - -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 --- -1.7.10.4 - diff --git a/standalone/linux/install-haskell-packages b/standalone/linux/install-haskell-packages index d2860f3e3..1b4225b4e 100755 --- a/standalone/linux/install-haskell-packages +++ b/standalone/linux/install-haskell-packages @@ -65,6 +65,7 @@ install_pkgs () { patched network patched wai-app-static + patched vector patched aeson patched shakespeare patched yesod-routes 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..4d39e91cf --- /dev/null +++ b/standalone/no-th/haskell-patches/vector_hack-to-build-with-new-ghc.patch @@ -0,0 +1,24 @@ +From b0a79f4f98188ba5d43b7e3912b36d34d099ab65 Mon Sep 17 00:00:00 2001 +From: dummy +Date: Fri, 18 Oct 2013 23:20:35 +0000 +Subject: [PATCH] cross build + +--- + Data/Vector/Fusion/Stream/Monadic.hs | 1 - + 1 file changed, 1 deletion(-) + +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 +-- +1.7.10.4 + -- cgit v1.2.3