summaryrefslogtreecommitdiff
path: root/standalone/android/haskell-patches/gsasl_0.3.5-0001-link-with-libgsasl.patch
diff options
context:
space:
mode:
Diffstat (limited to 'standalone/android/haskell-patches/gsasl_0.3.5-0001-link-with-libgsasl.patch')
-rw-r--r--standalone/android/haskell-patches/gsasl_0.3.5-0001-link-with-libgsasl.patch28
1 files changed, 13 insertions, 15 deletions
diff --git a/standalone/android/haskell-patches/gsasl_0.3.5-0001-link-with-libgsasl.patch b/standalone/android/haskell-patches/gsasl_0.3.5-0001-link-with-libgsasl.patch
index 05495a320..42206a1cf 100644
--- a/standalone/android/haskell-patches/gsasl_0.3.5-0001-link-with-libgsasl.patch
+++ b/standalone/android/haskell-patches/gsasl_0.3.5-0001-link-with-libgsasl.patch
@@ -1,27 +1,25 @@
-From c7d39a8f91af93203194313195a79b04d80a16a3 Mon Sep 17 00:00:00 2001
+From df0f41f92d003f7d59ef927737ffec3a9bd61827 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
-Date: Sun, 21 Apr 2013 15:22:00 -0400
-Subject: [PATCH] link with libgsasl
+Date: Tue, 7 May 2013 18:41:01 -0400
+Subject: [PATCH] avoid cabal hell
-This requires libgsasl.a (and no .so) be installed in the ugly hardcoded
-lib dir. When built this way, the haskell gsasl library will link the
-library into executables with no further options.
---
- gsasl.cabal | 1 +
- 1 file changed, 1 insertion(+)
+ gsasl.cabal | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gsasl.cabal b/gsasl.cabal
-index c5c2b19..a31cc71 100644
+index d991873..c5c2b19 100644
--- a/gsasl.cabal
+++ b/gsasl.cabal
-@@ -27,6 +27,7 @@ library
- ghc-options: -Wall -O2
- hs-source-dirs: lib
- c-sources: cbits/hsgsasl-shim.c
-+ LD-Options: -L /home/joey/.ghc/android-14/arm-linux-androideabi-4.7/arm-linux-androideabi/sysroot/usr/lib/
-
+@@ -31,7 +31,7 @@ library
build-depends:
base >= 4.0 && < 5.0
+ , transformers >= 0.2
+- , bytestring >= 0.9
++ , bytestring >= 0.10.3.0
+
+ pkgconfig-depends: libgsasl >= 1.1
+
--
1.7.10.4