From: Uwe Hermann <redacted>
Date: Mon, 22 Apr 2013 14:54:32 +0000 (+0200)
Subject: sigrok-cross-android: Add and build zlib.
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=167cb16e9aeff6a39a44c1b3ae2254ee00206cfa;p=sigrok-util.git

sigrok-cross-android: Add and build zlib.
---

diff --git a/cross-compile/android/sigrok-cross-android b/cross-compile/android/sigrok-cross-android
index a02dda2..758e64d 100755
--- a/cross-compile/android/sigrok-cross-android
+++ b/cross-compile/android/sigrok-cross-android
@@ -34,6 +34,7 @@ BUILDDIR=./sr_android_build
 
 VER_LIBICONV=1.14
 VER_GETTEXT=0.18.2
+VER_ZLIB=1.2.7
 VER_PCRE=8.32
 VER_LIBFFI=3.0.11
 VER_GLIB=2.34.3
@@ -83,7 +84,12 @@ git clone git://git.savannah.gnu.org/config.git
 ## cd ..
 
 # zlib (needed for glib and libzip)
-# TODO
+wget http://zlib.net/zlib-$VER_ZLIB.tar.gz
+tar xfvz zlib-$VER_ZLIB.tar.gz
+cd zlib-$VER_ZLIB
+# Note: zlib's configure doesn't understand --host, we need to pass $CC.
+CC=arm-linux-androideabi-gcc ./configure --prefix=$PREFIX && make && make install
+cd ..
 
 # pcre (needed for glib)
 wget ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-$VER_PCRE.tar.gz