X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=cross-compile%2Fandroid%2Fsigrok-cross-android;h=0baf485df24c97f4487847100aeede45d77df0fe;hb=6e15e874837b46516c75b64fd583415a636c00f8;hp=0dc8aa0e789cdd8fea2cdd2d9c3140a998264f32;hpb=87ea3974677d08ade8791e04ee8c9d0d1f12d22f;p=sigrok-util.git

diff --git a/cross-compile/android/sigrok-cross-android b/cross-compile/android/sigrok-cross-android
index 0dc8aa0..0baf485 100755
--- a/cross-compile/android/sigrok-cross-android
+++ b/cross-compile/android/sigrok-cross-android
@@ -35,31 +35,55 @@ 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
+VER_PYTHON=3.3.3
 
 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
-
-# Define some helper variables.
-C="--host=arm-linux-androideabi --prefix=$PREFIX"
-P="$PREFIX/lib/pkgconfig"
-
 # Remove build directory contents (if any) and create a new build dir.
 rm -rf $BUILDDIR
 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
+tar xJf Python-$VER_PYTHON.tar.xz
+cd Python-$VER_PYTHON
+./configure
+make python
+make Parser/pgen
+mv python hostpython
+mv Parser/pgen Parser/hostpgen
+cd ..
+
+# -----------------------------------------------------------------------------
+
+# We need to find tools in the toolchain.
+export PATH=$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"
+
+# Remember the directory we're in.
+case "$0" in
+  /*) TOP=$(dirname "$0");;
+  *) TOP=$(dirname "$(pwd)"/"$0");;
+esac
+
 # Get the latest versions of config.guess/config.sub that know about Android.
 git clone git://git.savannah.gnu.org/config.git
 
@@ -124,15 +148,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 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
+./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
+make install
+cd ..
 
 # libzip
 wget http://www.nih.at/libzip/libzip-$VER_LIBZIP.tar.gz
@@ -152,7 +177,7 @@ 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
+# Explicitly exclude libusbpp.la from lib_LTLIBRARIES, and skip subdirs.
 make lib_LTLIBRARIES=libusb.la SUBDIRS=.
 make lib_LTLIBRARIES=libusb.la SUBDIRS=. install
 cd ..
@@ -163,8 +188,63 @@ 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 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 ..
 
+# libserialport
+git clone git://sigrok.org/libserialport
+cd libserialport
+./autogen.sh
+./configure $C --without-libudev
+make
+make install
+cd ..
+
+# libsigrok
+git clone git://sigrok.org/libsigrok
+cd libsigrok
+./autogen.sh
+./configure $C
+make
+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
+cd libsigrokdecode
+./autogen.sh
+./configure $C
+make
+make install
+cd ..
+
+# sigrok-cli
+git clone git://sigrok.org/sigrok-cli
+cd sigrok-cli
+./autogen.sh
+./configure $C
+make
+make install
+cd ..