mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

fix gnutls to link, again

Browse source 
I don't know why, but I keep finding that the way I hacked this to work
before doesn't work and a new way is needed. Perhaps changes to cabal made
my old hacks break?
This commit is contained in:
Joey Hess 2014-05-26 17:56:41 -04:00
parent 69f793a2b2
commit ba1e14d502
Failed to extract signature
2 changed files with 17 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
doc/install/Android.mdwn
View file

@ -27,9 +27,9 @@ of Bath CS department.
git-annex can be built from source for Android. git-annex can be built from source for Android.
1. Run `standalone/android/buildchroot` as root (requires debootstrap). 1. Run `standalone/android/buildchroot` as root (requires debootstrap).
This builds a chroot with an `androidbuilder` user. This builds a chroot with an `builder` user.
The rest of the build will run in this chroot as that user. The rest of the build will run in this chroot as that user.
2. Then run `standalone/android/install-haskell-packages` 2. In the chroot, run `standalone/android/install-haskell-packages`
Note that this will break from time to time as new versions of packages Note that this will break from time to time as new versions of packages
are released, and the patches it applies have to be updated when are released, and the patches it applies have to be updated when
this happens. this happens.

24
standalone/android/haskell-patches/gnutls_0.1.4-0001-statically-link-with-gnutls.patch
View file

@ -1,23 +1,29 @@
From 67435289745b2f96fc9d1cd8e0263ef0565e4789 Mon Sep 17 00:00:00 2001 From 311aab1ae9d7a653edfbec1351f548b98de85c4b Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net> From: androidbuilder <androidbuilder@example.com>
Date: Tue, 26 Nov 2013 19:18:28 +0000 Date: Mon, 26 May 2014 21:54:18 +0000
Subject: [PATCH] hack gnutls to statically link Subject: [PATCH] hack gnutls to link on android
This uses a hardcoded path to the library, which includes the This uses a hardcoded path to the library, which includes the
arm-linux-androideabi-4.8 part. Will need to be changed when that changes.. arm-linux-androideabi-4.8 part. Will need to be changed when that changes..
Have to list all the libraries that gnutls depends on, pkgconfig depends
seems not to be working.
--- ---
gnutls.cabal | 6 ++---- gnutls.cabal | 9 +++++----
1 file changed, 2 insertions(+), 4 deletions(-) 1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/gnutls.cabal b/gnutls.cabal diff --git a/gnutls.cabal b/gnutls.cabal
index 5bfe687..ff1d08c 100644 index 5bfe687..61db23f 100644
--- a/gnutls.cabal --- a/gnutls.cabal
+++ b/gnutls.cabal +++ b/gnutls.cabal
@@ -31,16 +31,14 @@ source-repository this @@ -31,16 +31,17 @@ source-repository this
library library
hs-source-dirs: lib hs-source-dirs: lib
ghc-options: -Wall -O2 ghc-options: -Wall -O2
+ LD-Options: -L /home/builder/.ghc/android-14/arm-linux-androideabi-4.8/sysroot/usr/lib/ -l:libgnutls.a -l:libnettle.a -l:libhogweed.a -l:libgmp.a + LD-Options: -L /home/builder/.ghc/android-14/arm-linux-androideabi-4.8/sysroot/usr/lib/
+
+ extra-libraries: gnutls nettle hogweed gmp z
+ pkgconfig-depends: gnutls
build-depends: build-depends:
base >= 4.0 && < 5.0 base >= 4.0 && < 5.0