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

diff --git a/cross-compile/android/sigrok-cross-android b/cross-compile/android/sigrok-cross-android
index cd40fde..0baf485 100755
--- 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-3.3.3.tar.xz
+tar xJf Python-$VER_PYTHON.tar.xz
+cd Python-$VER_PYTHON
 ./configure
 make python
 make Parser/pgen
@@ -187,7 +188,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 ..
@@ -221,10 +223,10 @@ 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 ..