sigrok-cross-android: libsigrok: Drop --disable-alsa.

[sigrok-util.git] / cross-compile / android / sigrok-cross-android

diff --git a/cross-compile/android/sigrok-cross-android b/cross-compile/android/sigrok-cross-android
index 825bc154b9cead85e4005e7bc563952f415c30e7..2dcfc29ad181c06139f6632ee0a78c50c9b9e8a6 100755 (executable)
--- a/cross-compile/android/sigrok-cross-android
+++ b/cross-compile/android/sigrok-cross-android
@@ -35,14 +35,15 @@ BUILDDIR=./sr_android_build
 # -----------------------------------------------------------------------------
 
 VER_LIBICONV=1.14
-VER_GETTEXT=0.18.2
+VER_GETTEXT=0.18.3
 VER_ZLIB=1.2.8
-VER_PCRE=8.32
-VER_LIBFFI=3.0.11
+VER_PCRE=8.33
+VER_LIBFFI=3.0.13
 VER_GLIB=2.34.3
-VER_LIBZIP=0.10.1
+VER_LIBZIP=0.11.1
 VER_LIBUSB=0.1.12
 VER_LIBFTDI=0.20
+VER_LIBUSB_1_0=1.0.9
 
 SF_MIRROR=switch.dl.sourceforge.net
 
@@ -51,9 +52,18 @@ SF_MIRROR=switch.dl.sourceforge.net
 # We need to find tools in the toolchain and in the install directory.
 export PATH=$PREFIX/bin:$TOOLCHAIN/bin:$PATH
 
+# Tell pkg-config to only look for our cross-built stuff.
+export PKG_CONFIG_LIBDIR="$PREFIX/lib/pkgconfig"
+export -n PKG_CONFIG_PATH
+
 # Define some helper variables.
 C="--host=arm-linux-androideabi --prefix=$PREFIX"
-P="$PREFIX/lib/pkgconfig"
+
+# Remember the directory we're in.
+case "$0" in
+  /*) TOP=$(dirname "$0");;
+  *) TOP=$(dirname "$(pwd)"/"$0");;
+esac
 
 # Remove build directory contents (if any) and create a new build dir.
 rm -rf $BUILDDIR
@@ -65,29 +75,36 @@ git clone git://git.savannah.gnu.org/config.git
 
 # -----------------------------------------------------------------------------
 
-## # TODO: Doesn't build yet.
-## # libiconv (needed for glib)
-## wget http://ftp.gnu.org/pub/gnu/libiconv/libiconv-$VER_LIBICONV.tar.gz
-## tar xfz libiconv-$VER_LIBICONV.tar.gz
-## cd libiconv-$VER_LIBICONV
-## cp -f ../config/config.guess build-aux
-## cp -f ../config/config.sub build-aux
-## cp -f ../config/config.guess libcharset/build-aux
-## cp -f ../config/config.sub libcharset/build-aux
-## ./configure $C
-## make
-## make install
-## cd ..
-
-## # TODO: Needs libiconv
-## # gettext (needed for glib)
-## wget http://ftp.gnu.org/pub/gnu/gettext/gettext-$VER_GETTEXT.tar.gz
-## tar xfz gettext-$VER_GETTEXT.tar.gz
-## cd gettext-$VER_GETTEXT
-## ./configure $C
-## make
-## make install
-## cd ..
+# libiconv (needed for glib)
+wget http://ftp.gnu.org/pub/gnu/libiconv/libiconv-$VER_LIBICONV.tar.gz
+tar xfz libiconv-$VER_LIBICONV.tar.gz
+cd libiconv-$VER_LIBICONV
+cp -f ../config/config.guess build-aux
+cp -f ../config/config.sub build-aux
+cp -f ../config/config.guess libcharset/build-aux
+cp -f ../config/config.sub libcharset/build-aux
+./configure $C --enable-shared
+make lib/localcharset.h
+cd libcharset
+make
+make install
+cd ../lib
+make
+make install
+cd ..
+test -d $PREFIX/include || mkdir $PREFIX/include
+cp include/iconv.h.inst $PREFIX/include/iconv.h
+cd ..
+
+# gettext (needed for glib)
+wget http://ftp.gnu.org/pub/gnu/gettext/gettext-$VER_GETTEXT.tar.gz
+tar xfz gettext-$VER_GETTEXT.tar.gz
+cd gettext-$VER_GETTEXT
+./configure $C --enable-shared --disable-libasprintf
+cd gettext-runtime
+make
+make install
+cd ../..
 
 # zlib (needed for glib and libzip)
 wget http://zlib.net/zlib-$VER_ZLIB.tar.gz
@@ -103,7 +120,7 @@ cd ..
 wget ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-$VER_PCRE.tar.gz
 tar xfvz pcre-$VER_PCRE.tar.gz
 cd pcre-$VER_PCRE
-./configure $C
+./configure $C --disable-cpp
 make
 make install
 cd ..
@@ -117,15 +134,16 @@ make
 make install
 cd ..
 
-## # TODO: Not all build-dependencies build, yet.
-## # glib
-## wget ftp://ftp.gnome.org/pub/gnome/sources/glib/2.34/glib-$VER_GLIB.tar.xz
-## tar xfJ glib-$VER_GLIB.tar.xz
-## cd glib-$VER_GLIB
-## ./configure $C
-## make
-## make install
-## cd ..
+# glib
+wget https://github.com/djdeath/glib/archive/android.zip
+unzip -q android.zip
+cd glib-android
+./autogen.sh
+# Note: Manual LDFLAGS/CPPFLAGS needed for libiconv, rest uses pkg-config.
+LDFLAGS=-L$PREFIX/lib CPPFLAGS=-I$PREFIX/include glib_cv_stack_grows=no glib_cv_uscore=no ac_cv_func_posix_getpwuid_r=no ac_cv_func_posix_getgrgid_r=no ./configure $C --disable-modular-tests
+make
+make install
+cd ..
 
 # libzip
 wget http://www.nih.at/libzip/libzip-$VER_LIBZIP.tar.gz
@@ -145,8 +163,9 @@ cd libusb-$VER_LIBUSB
 cp -f ../config/config.guess .
 cp -f ../config/config.sub .
 ./configure $C
-make
-make install
+# Explicitly exclude libusbpp.la from lib_LTLIBRARIES, and skip subdirs.
+make lib_LTLIBRARIES=libusb.la SUBDIRS=.
+make lib_LTLIBRARIES=libusb.la SUBDIRS=. install
 cd ..
 
 # libftdi
@@ -160,3 +179,22 @@ make
 make install
 cd ..
 
+# libusb-1.0
+wget http://$SF_MIRROR/project/libusb/libusb-1.0/libusb-$VER_LIBUSB_1_0/libusb-$VER_LIBUSB_1_0.tar.bz2
+tar xfj libusb-$VER_LIBUSB_1_0.tar.bz2
+cd libusb-$VER_LIBUSB_1_0
+patch -p1 < $TOP/libusb-1.0.patch
+./configure $C
+make
+make install
+cd ..
+
+# libsigrok
+git clone git://sigrok.org/libsigrok
+cd libsigrok
+./autogen.sh
+./configure $C
+make
+make install
+cd ..
+