On 2015-02-07 10:03, Uwe Hermann wrote:
No need for all this handling really, please just add "V=1" and
"VERBOSE=1" unconditionally in the script, that's also consistent
with the other cross scripts.
Revised patch attached
/Uffe
>From fb789fd86d6964f25fb557469388fa60101bd75b Mon Sep 17 00:00:00 2001
From: Uffe Jakobsen <u...@uffe.org>
Date: Fri, 6 Feb 2015 17:53:30 +0100
Subject: [PATCH] Add make verbose handling to sigrok-cross-linux
This script works fine for FreeBSD - with the only exception that
gmake should be used in favour of make.
With such a small change - I don't think that is serves any purpose
to create a separate build script for FreeBSD
---
cross-compile/linux/sigrok-cross-linux | 42 +++++++++++++++++++---------------
1 file changed, 24 insertions(+), 18 deletions(-)
diff --git a/cross-compile/linux/sigrok-cross-linux b/cross-compile/linux/sigrok-cross-linux
index a01173a..48dfe3c 100755
--- a/cross-compile/linux/sigrok-cross-linux
+++ b/cross-compile/linux/sigrok-cross-linux
@@ -36,6 +36,9 @@ 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
+MAKE_VERBOSE="V=1 VERBOSE=1"
+
# Edit this to enable/disable/modify parallel compiles.
PARALLEL="-j 2"
@@ -51,6 +54,9 @@ PARALLEL="-j 2"
P="$PREFIX/lib/pkgconfig"
C="$C --prefix=$PREFIX"
+# GNU make is named gmake on BSD's
+MAKE=make
+
# Remove build directory contents (if any) and create a new build dir.
rm -rf $BUILDDIR
mkdir $BUILDDIR
@@ -67,8 +73,8 @@ cd libserialport
mkdir build
cd build
../configure $C
-$SB make $PARALLEL
-make install
+$SB $MAKE $MAKE_VERBOSE $PARALLEL
+$MAKE $MAKE_VERBOSE install
cd ../..
# libsigrok
@@ -78,10 +84,11 @@ cd libsigrok
./autogen.sh
mkdir build
cd build
-PKG_CONFIG_PATH=$P ../configure $C
-$SB make $PARALLEL
-PYTHONPATH=$PYPATH $SB make install
-$SB make check
+#PKG_CONFIG_PATH=$P ../configure $C
+PKG_CONFIG_PATH=$P ../configure $C --enable-cxx --disable-python --disable-java
+$SB $MAKE $MAKE_VERBOSE $PARALLEL
+PYTHONPATH=$PYPATH $SB $MAKE $MAKE_VERBOSE install
+$SB $MAKE $MAKE_VERBOSE check
cd ../..
# libsigrokdecode
@@ -91,9 +98,9 @@ cd libsigrokdecode
mkdir build
cd build
PKG_CONFIG_PATH=$P ../configure $C
-$SB make $PARALLEL
-make install
-$SB make check
+$SB $MAKE $MAKE_VERBOSE $PARALLEL
+$MAKE $MAKE_VERBOSE install
+$SB $MAKE $MAKE_VERBOSE check
cd ../..
# sigrok-firmware
@@ -104,7 +111,7 @@ mkdir build
cd build
# Nothing gets cross-compiled here, we just need 'make install' basically.
../configure $C
-make install
+$MAKE $MAKE_VERBOSE install
cd ../..
# sigrok-firmware-fx2lafw
@@ -115,8 +122,8 @@ mkdir build
cd build
# We're building the fx2lafw firmware on the host, no need to cross-compile.
../configure $C
-make $PARALLEL
-make install
+$MAKE $MAKE_VERBOSE $PARALLEL
+$MAKE $MAKE_VERBOSE install
cd ../..
# sigrok-cli
@@ -126,8 +133,8 @@ cd sigrok-cli
mkdir build
cd build
PKG_CONFIG_PATH=$P ../configure $C
-$SB make $PARALLEL
-make install
+$SB $MAKE $MAKE_VERBOSE $PARALLEL
+$MAKE $MAKE_VERBOSE install
cd ../..
# PulseView
@@ -136,8 +143,7 @@ cd pulseview
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
-$SB make test
+$SB $MAKE $MAKE_VERBOSE $PARALLEL
+$MAKE $MAKE_VERBOSE install
+$SB $MAKE $MAKE_VERBOSE test
cd ../..
-
--
2.3.0
------------------------------------------------------------------------------
Dive into the World of Parallel Programming. The Go Parallel Website,
sponsored by Intel and developed in partnership with Slashdot Media, is your
hub for all things parallel software development, from weekly thought
leadership blogs to news, videos, case studies, tutorials and more. Take a
look and join the conversation now. http://goparallel.sourceforge.net/
_______________________________________________
sigrok-devel mailing list
sigrok-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/sigrok-devel
