X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-util.git;a=blobdiff_plain;f=cross-compile%2Flinux%2Fsigrok-cross-linux;h=c7a79c4dbf6169ce4959f84c287a07f59e69c97b;hp=175f30166beb92cdf76817e8129a9dd56e5dc2ea;hb=4485db1e3014cd38e38e834a3f234da031c46f53;hpb=d419fd05ff36fa1da40dad9a827e68bc7a01e418

diff --git a/cross-compile/linux/sigrok-cross-linux b/cross-compile/linux/sigrok-cross-linux
index 175f301..c7a79c4 100755
--- a/cross-compile/linux/sigrok-cross-linux
+++ b/cross-compile/linux/sigrok-cross-linux
@@ -33,6 +33,9 @@ PREFIX=$HOME/sr
 # The path where to download files to and where to build packages.
 BUILDDIR=./build
 
+# The path where the libsigrok Python bindings will be installed.
+PYPATH=$PREFIX/lib/python2.7/site-packages
+
 # Edit this to enable/disable/modify parallel compiles.
 PARALLEL="-j 2"
 
@@ -56,62 +59,77 @@ GIT_CLONE="git clone --depth=1"
 $GIT_CLONE git://sigrok.org/libserialport
 cd libserialport
 ./autogen.sh
-./configure $C
+mkdir build
+cd build
+../configure $C
 make $PARALLEL
 make install
-cd ..
+cd ../..
 
 # libsigrok
+mkdir -p $PYPATH
 $GIT_CLONE git://sigrok.org/libsigrok
 cd libsigrok
 ./autogen.sh
-PKG_CONFIG_PATH=$P ./configure $C
+mkdir build
+cd build
+PKG_CONFIG_PATH=$P ../configure $C
 make $PARALLEL
-make install
-cd ..
+PYTHONPATH=$PYPATH make install
+cd ../..
 
 # libsigrokdecode
 $GIT_CLONE git://sigrok.org/libsigrokdecode
 cd libsigrokdecode
 ./autogen.sh
-PKG_CONFIG_PATH=$P ./configure $C
+mkdir build
+cd build
+PKG_CONFIG_PATH=$P ../configure $C
 make $PARALLEL
 make install
-cd ..
+cd ../..
 
 # sigrok-firmware
 $GIT_CLONE git://sigrok.org/sigrok-firmware
 cd sigrok-firmware
 ./autogen.sh
+mkdir build
+cd build
 # Nothing gets cross-compiled here, we just need 'make install' basically.
-./configure $C
+../configure $C
 make install
-cd ..
+cd ../..
 
 # sigrok-firmware-fx2lafw
 $GIT_CLONE git://sigrok.org/sigrok-firmware-fx2lafw
 cd sigrok-firmware-fx2lafw
 ./autogen.sh
+mkdir build
+cd build
 # We're building the fx2lafw firmware on the host, no need to cross-compile.
-./configure $C
+../configure $C
 make $PARALLEL
 make install
-cd ..
+cd ../..
 
 # sigrok-cli
 $GIT_CLONE git://sigrok.org/sigrok-cli
 cd sigrok-cli
 ./autogen.sh
-PKG_CONFIG_PATH=$P ./configure $C
+mkdir build
+cd build
+PKG_CONFIG_PATH=$P ../configure $C
 make $PARALLEL
 make install
-cd ..
+cd ../..
 
 # PulseView
 $GIT_CLONE git://sigrok.org/pulseview
 cd pulseview
-PKG_CONFIG_PATH=$P cmake -DCMAKE_INSTALL_PREFIX:PATH=$PREFIX -DDISABLE_WERROR=y -DENABLE_DECODE=y .
+mkdir build
+cd build
+PKG_CONFIG_PATH=$P cmake -DCMAKE_INSTALL_PREFIX:PATH=$PREFIX -DDISABLE_WERROR=y -DENABLE_TESTS=y ..
 make $PARALLEL
 make install
-cd ..
+cd ../..