diff options
author | Joey Hess <joey@kitenet.net> | 2013-05-07 17:46:08 -0400 |
---|---|---|
committer | Joey Hess <joey@kitenet.net> | 2013-05-07 17:46:08 -0400 |
commit | fecb2d5a2b68e1184dc45ca93ee49dbd6ec5f580 (patch) | |
tree | 9126ff832065cd70af06c6ef35bde7694b359a14 /standalone/android | |
parent | eefd09d53cfbbaff1c603ebfc288a1f6f8cd3002 (diff) |
version bytestring build dep to avoid cabal hell
Diffstat (limited to 'standalone/android')
-rw-r--r-- | standalone/android/haskell-patches/cipher-aes_0.1.7-0001-fix-cross-build.patch | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/standalone/android/haskell-patches/cipher-aes_0.1.7-0001-fix-cross-build.patch b/standalone/android/haskell-patches/cipher-aes_0.1.7-0001-fix-cross-build.patch index c38e9fdff..fab0ae6ef 100644 --- a/standalone/android/haskell-patches/cipher-aes_0.1.7-0001-fix-cross-build.patch +++ b/standalone/android/haskell-patches/cipher-aes_0.1.7-0001-fix-cross-build.patch @@ -1,17 +1,25 @@ -From ef1cfb5c9731f1e99d013e704ed465d3cff35df2 Mon Sep 17 00:00:00 2001 +From d456247000ab839a1d32749717f4f8f92e37dbba Mon Sep 17 00:00:00 2001 From: Joey Hess <joey@kitenet.net> -Date: Tue, 7 May 2013 17:38:22 -0400 +Date: Tue, 7 May 2013 17:45:45 -0400 Subject: [PATCH] fix cross build --- - cipher-aes.cabal | 3 --- - 1 file changed, 3 deletions(-) + cipher-aes.cabal | 5 +---- + 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/cipher-aes.cabal b/cipher-aes.cabal -index 02ddfd0..c47bf0c 100644 +index 02ddfd0..eb916e3 100644 --- a/cipher-aes.cabal +++ b/cipher-aes.cabal -@@ -38,9 +38,6 @@ Library +@@ -31,16 +31,13 @@ Extra-Source-Files: Tests/*.hs + + Library + Build-Depends: base >= 4 && < 5 +- , bytestring ++ , bytestring >= 0.10.3.0 + Exposed-modules: Crypto.Cipher.AES + ghc-options: -Wall + C-sources: cbits/aes_generic.c cbits/aes.c cbits/gf.c cbits/cpu.c |