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

diff --git a/cross-compile/linux/sigrok-cross-linux b/cross-compile/linux/sigrok-cross-linux
index 1bb00fc..c7ae22e 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.
 ##
@@ -31,11 +31,22 @@ 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 control verbose build output.
+# V="V=1 VERBOSE=1"
 
 # 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 +59,87 @@ 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
-make install
-cd ..
+mkdir build
+cd build
+../configure $C
+$SB make $PARALLEL $V
+make install $V
+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 $V
+PYTHONPATH=$PYPATH $SB make install $V
+$SB make check $V
+cd ../..
 
 # libsigrokdecode
-git clone git://sigrok.org/libsigrokdecode
+$GIT_CLONE git://sigrok.org/libsigrokdecode
 cd libsigrokdecode
 ./autogen.sh
-./configure $C
-make $PARALLEL
-make install
-cd ..
+mkdir build
+cd build
+PKG_CONFIG_PATH=$P ../configure $C
+$SB make $PARALLEL $V
+make install $V
+$SB make check $V
+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
-make install
-cd ..
+../configure $C
+make install $V
+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
-make $PARALLEL
-make install
-cd ..
+../configure $C
+make $PARALLEL $V
+make install $V
+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
-make install
-cd ..
+mkdir build
+cd build
+PKG_CONFIG_PATH=$P ../configure $C
+$SB make $PARALLEL $V
+make install $V
+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
-make install
-cd ..
-
+mkdir build
+cd build
+PKG_CONFIG_PATH=$P $SB cmake -DCMAKE_INSTALL_PREFIX:PATH=$PREFIX -DDISABLE_WERROR=y -DENABLE_TESTS=y ..
+$SB make $PARALLEL $V
+make install $V
+$SB make test $V
+cd ../..