X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=cross-compile%2Flinux%2Fsigrok-cross-linux;h=a01173ab7c37aa97f8073ecae9f88c33cbaa2a03;hb=ab2ccf3daeb8ede4f22f25a95a0cb6475e278066;hp=4886f5b9009f22dd823c6d51c300f833ba84df4d;hpb=07947dda98729499f1c8b85a8ce8b27d9f5a6753;p=sigrok-util.git

diff --git a/cross-compile/linux/sigrok-cross-linux b/cross-compile/linux/sigrok-cross-linux
index 4886f5b..a01173a 100755
--- a/cross-compile/linux/sigrok-cross-linux
+++ b/cross-compile/linux/sigrok-cross-linux
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 ##
 ## This file is part of the sigrok-util project.
 ##
@@ -33,9 +33,17 @@ 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"
 
+# Uncomment the following lines to build with clang and run scan-build.
+# export CC=clang
+# export CXX=clang++
+# SB="scan-build -k -v"
+
 # You usually don't need to change anything below this line.
 
 # -----------------------------------------------------------------------------
@@ -48,68 +56,88 @@ 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
-make $PARALLEL
+mkdir build
+cd build
+../configure $C
+$SB 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
-make $PARALLEL
-make install
-cd ..
+mkdir build
+cd build
+PKG_CONFIG_PATH=$P ../configure $C
+$SB make $PARALLEL
+PYTHONPATH=$PYPATH $SB make install
+$SB make check
+cd ../..
 
 # libsigrokdecode
-git clone git://sigrok.org/libsigrokdecode
+$GIT_CLONE git://sigrok.org/libsigrokdecode
 cd libsigrokdecode
 ./autogen.sh
-./configure $C
-make $PARALLEL
+mkdir build
+cd build
+PKG_CONFIG_PATH=$P ../configure $C
+$SB make $PARALLEL
 make install
-cd ..
+$SB make check
+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
-make $PARALLEL
+mkdir build
+cd build
+PKG_CONFIG_PATH=$P ../configure $C
+$SB 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 .
-make $PARALLEL
+mkdir build
+cd build
+PKG_CONFIG_PATH=$P $SB cmake -DCMAKE_INSTALL_PREFIX:PATH=$PREFIX -DDISABLE_WERROR=y -DENABLE_TESTS=y ..
+$SB make $PARALLEL
 make install
-cd ..
+$SB make test
+cd ../..