X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=cross-compile%2Fandroid%2Fsigrok-cross-android;h=17602b03bd0a307724d5b6090c0866ecf49a3617;hb=ab2ccf3daeb8ede4f22f25a95a0cb6475e278066;hp=20eeb7685b3f7286d5e001f82f31c7d39feffbb9;hpb=c79d75cf2ca43bd1fd4bd59948bebaa3db2c2be1;p=sigrok-util.git

diff --git a/cross-compile/android/sigrok-cross-android b/cross-compile/android/sigrok-cross-android
index 20eeb76..17602b0 100755
--- a/cross-compile/android/sigrok-cross-android
+++ b/cross-compile/android/sigrok-cross-android
@@ -25,7 +25,7 @@ set -e
 ANDROID_PATH=$HOME/android
 
 # The path where the Android NDK is located.
-ANDROID_NDK=$ANDROID_PATH/android-ndk-r10c
+ANDROID_NDK=$ANDROID_PATH/android-ndk-r10d
 
 # The path where the Android SDK is located.
 ANDROID_SDK=$ANDROID_PATH/android-sdk-linux
@@ -70,9 +70,9 @@ VER_LIBZIP=0.11.2
 VER_LIBFTDI1=1.1
 VER_LIBUSB=1.0.19
 VER_PYTHON=3.3.3
-VER_BOOST=1.55.0
+VER_BOOST=1.57.0
 VER_QT=5.3.1
-VER_NDK=10c
+VER_NDK=10d
 VER_SDK=23.0.2
 
 SF_MIRROR=switch.dl.sourceforge.net
@@ -409,10 +409,9 @@ 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//./_}
-patch -p1 < ../../boost.patch
 CC= ./bootstrap.sh --with-toolset=gcc --with-libraries=filesystem,system,thread --without-icu
 echo "using gcc : $NDK_TOOLCHAIN_VERSION : \"${TOOLCHAIN_TRIPLET}-g++\" : <cxxflags>\"$SYSROOT -I$PREFIX/include $CPPFLAGS_STL\" <linkflags>\"$SYSROOT -L$PREFIX/lib $LDFLAGS_STL -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 $PARALLEL
+./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 ..
 
 # Qt (needed for PulseView)