From: Marcus Comstedt <redacted>
Date: Sat, 12 Apr 2014 11:58:45 +0000 (+0200)
Subject: sigrok-cross-android: Switch boost to use gnu-libstdc++ instead of stlport
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=b03a5e4895bf6bd0ae8634c139276a67df28f728;p=sigrok-util.git

sigrok-cross-android: Switch boost to use gnu-libstdc++ instead of stlport
---

diff --git a/cross-compile/android/sigrok-cross-android b/cross-compile/android/sigrok-cross-android
index f186451..b845039 100755
--- a/cross-compile/android/sigrok-cross-android
+++ b/cross-compile/android/sigrok-cross-android
@@ -296,7 +296,7 @@ tar xfj boost_${VER_BOOST//./_}.tar.bz2
 cd boost_${VER_BOOST//./_}
 patch -p1 < ../../boost.patch
 ./bootstrap.sh --with-toolset=gcc --with-libraries=filesystem,system,thread --without-icu
-echo "using gcc : $NDK_TOOLCHAIN_VERSION : \"${TOOLCHAIN_TRIPLET}-g++\" : <cxxflags>\"-I$PREFIX/include -I${ANDROID_NDK}/sources/cxx-stl/stlport/stlport\" <linkflags>\"-L$PREFIX/lib\" ;" > user-config.jam
+echo "using gcc : $NDK_TOOLCHAIN_VERSION : \"${TOOLCHAIN_TRIPLET}-g++\" : <cxxflags>\"-I$PREFIX/include -I${ANDROID_NDK}/sources/cxx-stl/gnu-libstdc++/${NDK_TOOLCHAIN_VERSION}/include -I${ANDROID_NDK}/sources/cxx-stl/gnu-libstdc++/${NDK_TOOLCHAIN_VERSION}/libs/${TARGET_ARCH}/include\" <linkflags>\"-L$PREFIX/lib -L${ANDROID_NDK}/sources/cxx-stl/gnu-libstdc++/${NDK_TOOLCHAIN_VERSION}/libs/${TARGET_ARCH} -lgnustl_shared\" ;" > user-config.jam
 ./b2 -q -d+2 --user-config=user-config.jam toolset=gcc variant=release link=shared threading=multi runtime-link=shared target-os=android --prefix=$PREFIX --layout=system install
 cd ..