sigrok-cross-android: Drop $TOP usage for now.

[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 2cb15250ec9257b7f93a8d7881c691a9b5fe2b68..829906b23a468a534d07165a75bfb991985c230b 100755 (executable)
--- a/cross-compile/android/sigrok-cross-android
+++ b/cross-compile/android/sigrok-cross-android
@@ -44,6 +44,7 @@ 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
 
@@ -55,9 +56,9 @@ mkdir $BUILDDIR
 cd $BUILDDIR
 
 # Build host Python before we start messing with the environment.
-wget http://python.org/ftp/python/3.3.3/Python-3.3.3.tar.xz
-tar xJf Python-3.3.3.tar.xz
-cd Python-3.3.3
+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
@@ -77,12 +78,6 @@ 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
 
@@ -187,7 +182,8 @@ tar xfz libftdi-$VER_LIBFTDI.tar.gz
 cd libftdi-$VER_LIBFTDI
 cp -f ../config/config.guess .
 cp -f ../config/config.sub .
-./configure $C
+# libftdi needs to find libusb-config which is installed in $PREFIX/bin.
+PATH=$PREFIX/bin:$PATH ./configure $C
 make
 make install
 cd ..
@@ -196,12 +192,21 @@ cd ..
 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
+patch -p1 < ../../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
@@ -212,10 +217,28 @@ make install
 cd ..
 
 # Python
-cd Python-3.3.3
+cd Python-$VER_PYTHON
 make distclean
 autoreconf
-patch -p1 < ../../Python-3.3.3.patch
+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 ..