X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-util.git;a=blobdiff_plain;f=cross-compile%2Fandroid%2Fsigrok-cross-android;h=81dc357f2e3143b63fc03981097907f085b0a60d;hp=7cdbebe0f5af0697da6f17a5b06ba58155b62aa3;hb=7966c37c48496a1a44582001d601b6cdc72463e4;hpb=819eb05bc7b19dfebe37fe09e0f52b95195f4b26

diff --git a/cross-compile/android/sigrok-cross-android b/cross-compile/android/sigrok-cross-android
index 7cdbebe..81dc357 100755
--- a/cross-compile/android/sigrok-cross-android
+++ b/cross-compile/android/sigrok-cross-android
@@ -36,7 +36,7 @@ TOOLCHAIN_TRIPLET=arm-linux-androideabi
 PREFIX=$HOME/sr_android
 
 # The path where to download files to and where to build packages.
-BUILDDIR=./sr_android_build
+BUILDDIR=./build
 
 # Edit this to enable/disable/modify parallel compiles.
 PARALLEL="-j 2"
@@ -53,13 +53,22 @@ VER_LIBFFI=3.0.13
 VER_GLIB=2.38.2
 VER_GLIB_SHORT=2.38
 VER_LIBZIP=0.11.1
-VER_LIBUSB=0.1.12
-VER_LIBFTDI=0.20
+VER_LIBFTDI1=1.1
 VER_LIBUSBX=1.0.17
 VER_PYTHON=3.3.3
 
 SF_MIRROR=switch.dl.sourceforge.net
 
+WGET="wget --quiet"
+GIT_CLONE="git clone --depth=1"
+
+case "$TOOLCHAIN_TRIPLET" in
+  arm*) TARGET_ARCH=armeabi;;
+  mips*) TARGET_ARCH=mips;;
+  i686*) TARGET_ARCH=x86;;
+  *) echo >&2 "Unknown prefix for TOOLCHAIN_TRIPLET"; exit 1;;
+esac
+
 # -----------------------------------------------------------------------------
 
 # Remove build directory contents (if any) and create a new build dir.
@@ -68,7 +77,7 @@ mkdir $BUILDDIR
 cd $BUILDDIR
 
 # Build host Python before we start messing with the environment.
-wget http://python.org/ftp/python/$VER_PYTHON/Python-$VER_PYTHON.tar.xz
+$WGET http://python.org/ftp/python/$VER_PYTHON/Python-$VER_PYTHON.tar.xz
 tar xJf Python-$VER_PYTHON.tar.xz
 cd Python-$VER_PYTHON
 ./configure
@@ -89,9 +98,14 @@ export -n PKG_CONFIG_PATH
 
 # Define some helper variables.
 C="--host=$TOOLCHAIN_TRIPLET --prefix=$PREFIX"
+CM="-Wno-dev -DCMAKE_TOOLCHAIN_FILE=../android.toolchain.cmake -DANDROID_ABI=${TARGET_ARCH} -DCMAKE_INSTALL_PREFIX=${PREFIX} -DANDROID_STANDALONE_TOOLCHAIN=${TOOLCHAIN}"
 
 # Get the latest versions of config.guess/config.sub that know about Android.
-git clone git://git.savannah.gnu.org/config.git
+$GIT_CLONE git://git.savannah.gnu.org/config.git
+
+# Get a toolchain for cmake that knows about Android
+wget https://android-cmake.googlecode.com/hg/toolchain/android.toolchain.cmake
+patch < ../android.toolchain.cmake.patch android.toolchain.cmake
 
 # -----------------------------------------------------------------------------
 
@@ -105,7 +119,7 @@ make HOSTPYTHON=./hostpython HOSTPGEN=./Parser/hostpgen install $PARALLEL
 cd ..
 
 # libiconv (needed for glib)
-wget http://ftp.gnu.org/pub/gnu/libiconv/libiconv-$VER_LIBICONV.tar.gz
+$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
@@ -126,7 +140,7 @@ 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
+$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
@@ -136,7 +150,7 @@ make install
 cd ../..
 
 # zlib (needed for glib and libzip)
-wget http://zlib.net/zlib-$VER_ZLIB.tar.gz
+$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.
@@ -146,7 +160,7 @@ make install
 cd ..
 
 # pcre (needed for glib)
-wget ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-$VER_PCRE.tar.gz
+$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 --disable-cpp
@@ -155,7 +169,7 @@ make install
 cd ..
 
 # libffi (needed for glib)
-wget ftp://sourceware.org/pub/libffi/libffi-$VER_LIBFFI.tar.gz
+$WGET ftp://sourceware.org/pub/libffi/libffi-$VER_LIBFFI.tar.gz
 tar xfz libffi-$VER_LIBFFI.tar.gz
 cd libffi-$VER_LIBFFI
 ./configure $C
@@ -164,7 +178,7 @@ make install
 cd ..
 
 # glib
-wget http://ftp.gnome.org/pub/gnome/sources/glib/$VER_GLIB_SHORT/glib-$VER_GLIB.tar.xz
+$WGET http://ftp.gnome.org/pub/gnome/sources/glib/$VER_GLIB_SHORT/glib-$VER_GLIB.tar.xz
 tar xJf glib-$VER_GLIB.tar.xz
 cd glib-$VER_GLIB
 ./autogen.sh
@@ -175,7 +189,7 @@ make install
 cd ..
 
 # libzip
-wget http://www.nih.at/libzip/libzip-$VER_LIBZIP.tar.gz
+$WGET http://www.nih.at/libzip/libzip-$VER_LIBZIP.tar.gz
 tar xfz libzip-$VER_LIBZIP.tar.gz
 cd libzip-$VER_LIBZIP
 cp -f ../config/config.guess .
@@ -185,32 +199,8 @@ make $PARALLEL
 make install
 cd ..
 
-# libusb-0.1 (not used directly, but needed for libftdi)
-wget http://$SF_MIRROR/project/libusb/libusb-0.1%20%28LEGACY%29/$VER_LIBUSB/libusb-$VER_LIBUSB.tar.gz
-tar xfz libusb-$VER_LIBUSB.tar.gz
-cd libusb-$VER_LIBUSB
-cp -f ../config/config.guess .
-cp -f ../config/config.sub .
-./configure $C
-# Explicitly exclude libusbpp.la from lib_LTLIBRARIES, and skip subdirs.
-make lib_LTLIBRARIES=libusb.la SUBDIRS=. $PARALLEL
-make lib_LTLIBRARIES=libusb.la SUBDIRS=. install
-cd ..
-
-# libftdi
-wget http://www.intra2net.com/en/developer/libftdi/download/libftdi-$VER_LIBFTDI.tar.gz
-tar xfz libftdi-$VER_LIBFTDI.tar.gz
-cd libftdi-$VER_LIBFTDI
-cp -f ../config/config.guess .
-cp -f ../config/config.sub .
-# libftdi needs to find libusb-config which is installed in $PREFIX/bin.
-PATH=$PREFIX/bin:$PATH ./configure $C
-make $PARALLEL
-make install
-cd ..
-
 # libusb-1.0
-wget http://$SF_MIRROR/project/libusbx/releases/$VER_LIBUSBX/source/libusbx-$VER_LIBUSBX.tar.bz2
+$WGET http://$SF_MIRROR/project/libusbx/releases/$VER_LIBUSBX/source/libusbx-$VER_LIBUSBX.tar.bz2
 tar xfj libusbx-$VER_LIBUSBX.tar.bz2
 cd libusbx-$VER_LIBUSBX
 patch -p1 < ../../libusb-1.0.patch
@@ -219,39 +209,48 @@ make $PARALLEL
 make install
 cd ..
 
+# libftdi1
+$WGET http://www.intra2net.com/en/developer/libftdi/download/libftdi1-$VER_LIBFTDI1.tar.bz2
+tar xfj libftdi1-$VER_LIBFTDI1.tar.bz2
+cd libftdi1-$VER_LIBFTDI1
+cmake $CM .
+make $PARALLEL
+make install
+cd ..
+
 # libserialport
-git clone git://sigrok.org/libserialport
+$GIT_CLONE git://sigrok.org/libserialport
 cd libserialport
 ./autogen.sh
-./configure $C --without-libudev
-make $PARALLEL
+./configure $C
+make $PARALLEL V=1
 make install
 cd ..
 
 # libsigrok
-git clone git://sigrok.org/libsigrok
+$GIT_CLONE git://sigrok.org/libsigrok
 cd libsigrok
 ./autogen.sh
 ./configure $C
-make $PARALLEL
+make $PARALLEL V=1
 make install
 cd ..
 
 # libsigrokdecode
-git clone git://sigrok.org/libsigrokdecode
+$GIT_CLONE git://sigrok.org/libsigrokdecode
 cd libsigrokdecode
 ./autogen.sh
 ./configure $C
-make $PARALLEL
+make $PARALLEL V=1
 make install
 cd ..
 
 # sigrok-cli
-git clone git://sigrok.org/sigrok-cli
+$GIT_CLONE git://sigrok.org/sigrok-cli
 cd sigrok-cli
 ./autogen.sh
 ./configure $C
-make $PARALLEL
+make $PARALLEL V=1
 make install
 cd ..