From: Uwe Hermann Date: Tue, 3 Mar 2015 21:01:10 +0000 (+0100) Subject: sigrok-cross-android: PulseView: Add -DENABLE_TESTS=y. X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-util.git;a=commitdiff_plain;h=0369c8a6b15b91e206f2db856919d2df42ff8939;hp=9f8f07beb86cefd4f62c586ed2ba00d1ec21c0c5 sigrok-cross-android: PulseView: Add -DENABLE_TESTS=y. This helps to notice build issues in the test suite as well. --- diff --git a/cross-compile/android/sigrok-cross-android b/cross-compile/android/sigrok-cross-android index 1000b76..eeb0ebb 100755 --- a/cross-compile/android/sigrok-cross-android +++ b/cross-compile/android/sigrok-cross-android @@ -413,7 +413,7 @@ NDK_HOST=`"$ANDROID_NDK/ndk-build" -p 2>/dev/null | awk '$1 == "HOST_TAG" { prin $WGET http://$SF_MIRROR/project/boost/boost/$VER_BOOST/boost_${VER_BOOST//./_}.tar.bz2 tar xfj boost_${VER_BOOST//./_}.tar.bz2 cd boost_${VER_BOOST//./_} -CC= ./bootstrap.sh --with-toolset=gcc --with-libraries=filesystem,system,thread --without-icu +CC= ./bootstrap.sh --with-toolset=gcc --with-libraries=filesystem,system,thread,test --without-icu echo "using gcc : $NDK_TOOLCHAIN_VERSION : \"${TOOLCHAIN_TRIPLET}-g++\" : \"$SYSROOT -I$PREFIX/include $CPPFLAGS_STL\" \"$SYSROOT -L$PREFIX/lib $LDFLAGS_STL -lgnustl_shared\" ;" > user-config.jam ./b2 -q -d+2 --ignore-site-config --user-config=user-config.jam toolset=gcc variant=release link=shared threading=multi runtime-link=shared target-os=android --prefix=$PREFIX --layout=system install $PARALLEL cd .. @@ -443,7 +443,7 @@ find $PREFIX -iname "*.so" -exec ${TOOLCHAIN_TRIPLET}-strip -S {} \; # PulseView $GIT_CLONE git://sigrok.org/pulseview cd pulseview -cmake $CM . +cmake $CM -DENABLE_TESTS=y . make $PARALLEL $V make install $V ${TOOLCHAIN_TRIPLET}-strip -S libs/$TARGET_ARCH/libpulseview.so