X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-util.git;a=blobdiff_plain;f=cross-compile%2Fandroid%2Fsigrok-cross-android;h=f63deefcc8d8bf2752cfc7ca29a9384c533a0524;hp=0baf485df24c97f4487847100aeede45d77df0fe;hb=a51ca6bd7de99d4340c0706284eea06b3482bf32;hpb=5451bfe2fefb96a2c5a427c334d980500831b5b8

diff --git a/cross-compile/android/sigrok-cross-android b/cross-compile/android/sigrok-cross-android
index 0baf485..f63deef 100755
--- a/cross-compile/android/sigrok-cross-android
+++ b/cross-compile/android/sigrok-cross-android
@@ -23,12 +23,23 @@ set -e
 
 # The path where your Android toolchain directory is located.
 TOOLCHAIN=$HOME/android/android-arm-toolchain
+# TOOLCHAIN=$HOME/android/android-mipsel-toolchain
+# TOOLCHAIN=$HOME/android/android-i686-toolchain
+
+# Select which Android toolchain to use.
+# Don't forget to also adapt TOOLCHAIN above if you change TOOLCHAIN_TRIPLET!
+TOOLCHAIN_TRIPLET=arm-linux-androideabi
+# TOOLCHAIN_TRIPLET=mipsel-linux-android
+# TOOLCHAIN_TRIPLET=i686-linux-android
 
 # The path where the cross-compiled packages will be installed.
 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"
 
 # You usually don't need to change anything below this line.
 
@@ -39,15 +50,19 @@ VER_GETTEXT=0.18.3
 VER_ZLIB=1.2.8
 VER_PCRE=8.33
 VER_LIBFFI=3.0.13
-VER_GLIB=2.34.3
+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_LIBUSB_1_0=1.0.9
+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"
+
 # -----------------------------------------------------------------------------
 
 # Remove build directory contents (if any) and create a new build dir.
@@ -56,12 +71,12 @@ mkdir $BUILDDIR
 cd $BUILDDIR
 
 # Build host Python before we start messing with the environment.
-wget http://python.org/ftp/python/$VER_PYTHON/Python-3.3.3.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
-make python
-make Parser/pgen
+make python $PARALLEL
+make Parser/pgen $PARALLEL
 mv python hostpython
 mv Parser/pgen Parser/hostpgen
 cd ..
@@ -76,21 +91,24 @@ export PKG_CONFIG_LIBDIR="$PREFIX/lib/pkgconfig"
 export -n PKG_CONFIG_PATH
 
 # Define some helper variables.
-C="--host=arm-linux-androideabi --prefix=$PREFIX"
-
-# Remember the directory we're in.
-case "$0" in
-  /*) TOP=$(dirname "$0");;
-  *) TOP=$(dirname "$(pwd)"/"$0");;
-esac
+C="--host=$TOOLCHAIN_TRIPLET --prefix=$PREFIX"
 
 # 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
 
 # -----------------------------------------------------------------------------
 
+# Python (needed for libsigrokdecode)
+cd Python-$VER_PYTHON
+make distclean
+autoreconf
+patch -p1 < ../../Python-$VER_PYTHON.patch
+ac_cv_file__dev_ptmx=no ac_cv_file__dev_ptc=no ac_cv_func_pipe2=no ac_cv_func_fdatasync=no ac_cv_func_killpg=no ac_cv_func_waitid=no ac_cv_func_sigaltstack=no ./configure $C --build=x86_64-linux-gnu --disable-ipv6
+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
@@ -100,10 +118,10 @@ cp -f ../config/config.sub libcharset/build-aux
 ./configure $C --enable-shared
 make lib/localcharset.h
 cd libcharset
-make
+make $PARALLEL
 make install
 cd ../lib
-make
+make $PARALLEL
 make install
 cd ..
 test -d $PREFIX/include || mkdir $PREFIX/include
@@ -111,140 +129,132 @@ 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
 cd gettext-runtime
-make
+make $PARALLEL
 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.
-CC=arm-linux-androideabi-gcc ./configure --prefix=$PREFIX
-make
+CC=$TOOLCHAIN_TRIPLET-gcc ./configure --prefix=$PREFIX
+make $PARALLEL
 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
-make
+make $PARALLEL
 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
-make
+make $PARALLEL
 make install
 cd ..
 
 # glib
-wget http://ftp.gnome.org/pub/gnome/sources/glib/2.38/glib-2.38.2.tar.xz
-tar xJf glib-2.38.2.tar.xz
-cd glib-2.38.2
+$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
 # 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
-make
+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 --disable-compile-warnings $C
+make $PARALLEL
 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 .
 cp -f ../config/config.sub .
 ./configure $C
-make
+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
+$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=.
+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
+$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
+make $PARALLEL
 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
+$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
+./configure $C --disable-udev
+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
+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
+make $PARALLEL V=1
 make install
 cd ..
 
-# Python
-cd Python-$VER_PYTHON
-make distclean
-autoreconf
-patch -p1 < ../../Python-$VER_PYTHON.patch
-ac_cv_file__dev_ptmx=no ac_cv_file__dev_ptc=no ac_cv_func_pipe2=no ac_cv_func_fdatasync=no ac_cv_func_killpg=no ac_cv_func_waitid=no ac_cv_func_sigaltstack=no ./configure $C --build=x86_64-linux-gnu --disable-ipv6
-make HOSTPYTHON=./hostpython HOSTPGEN=./Parser/hostpgen install
-cd ..
-
 # libsigrokdecode
-git clone git://sigrok.org/libsigrokdecode
+$GIT_CLONE git://sigrok.org/libsigrokdecode
 cd libsigrokdecode
 ./autogen.sh
 ./configure $C
-make
+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
+make $PARALLEL V=1
 make install
 cd ..
+