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

diff --git a/cross-compile/linux/sigrok-cross-linux b/cross-compile/linux/sigrok-cross-linux
index 1bb00fc..c7a79c4 100755
--- a/cross-compile/linux/sigrok-cross-linux
+++ b/cross-compile/linux/sigrok-cross-linux
@@ -31,7 +31,10 @@ set -e
 PREFIX=$HOME/sr
 
 # The path where to download files to and where to build packages.
-BUILDDIR=./sr_linux_build
+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"
@@ -48,68 +51,85 @@ rm -rf $BUILDDIR
 mkdir $BUILDDIR
 cd $BUILDDIR
 
+GIT_CLONE="git clone --depth=1"
+
 # -----------------------------------------------------------------------------
 
 # libserialport
-git clone git://sigrok.org/libserialport
+$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
-git clone git://sigrok.org/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
+$GIT_CLONE git://sigrok.org/libsigrokdecode
 cd libsigrokdecode
 ./autogen.sh
-./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
+$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
+$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
+$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
+$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 ../..