X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-util.git;a=blobdiff_plain;f=cross-compile%2Fandroid%2Fsigrok-cross-android;h=a26f568f0ef0bb5a4d9eacbaec7a7bac7e7ca00a;hp=8e9356b64ee21c0db07ed399a9fccb8c74d63221;hb=8cf06ef35373da908f1a19e9a32a7939dc30f636;hpb=c495c6dd988f138cbd0563971532052a08e2b1da

diff --git a/cross-compile/android/sigrok-cross-android b/cross-compile/android/sigrok-cross-android
index 8e9356b..a26f568 100755
--- a/cross-compile/android/sigrok-cross-android
+++ b/cross-compile/android/sigrok-cross-android
@@ -78,7 +78,7 @@ VER_PYTHON=3.3.3
 VER_BOOST=1.58.0
 VER_QT=5.6.0
 VER_QT_SHORT=5.6
-VER_SIGROK_FIRMWARE_FX2LAFW=0.1.3
+VER_SIGROK_FIRMWARE_FX2LAFW=0.1.6
 VER_NDK=10e
 VER_SDK=24.4.1
 VER_AND_BT=23.0.2 # Android build tools version
@@ -191,6 +191,7 @@ else
   CM="$CM -DANDROID_NDK=${ANDROID_NDK}"
   CM="$CM -DANDROID_NATIVE_API_LEVEL=${NATIVE_API_LEVEL}"
   CM="$CM -DANDROID_TOOLCHAIN_NAME=${TOOLCHAIN_TRIPLET}-${NDK_TOOLCHAIN_VERSION}"
+  CM="$CM -DCMAKE_MAKE_PROGRAM=${ANDROID_NDK}/prebuilt/linux-x86/bin/make"
 fi
 
 # Look for STL, needed to build bindings
@@ -227,6 +228,7 @@ ac_cv_file__dev_ptmx=no ac_cv_file__dev_ptc=no ac_cv_func_pipe2=no ac_cv_func_fd
 sed -i "s/^#zlib/zlib/g" Modules/Setup
 sed -i "s/^#math/math/g" Modules/Setup
 sed -i "s/^#time/time/g" Modules/Setup
+sed -i "s/^#_struct/_struct/g" Modules/Setup
 make PYTHON_FOR_BUILD='_PYTHON_HOST_PLATFORM=$(_PYTHON_HOST_PLATFORM) ./hostpython' install $V
 cd ..
 
@@ -442,7 +444,7 @@ $WGET http://$SF_MIRROR/project/boost/boost/$VER_BOOST/boost_${VER_BOOST//./_}.t
 tar xfj boost_${VER_BOOST//./_}.tar.bz2
 cd boost_${VER_BOOST//./_}
 patch -p0 < ../../boost_wchar.patch
-CC= ./bootstrap.sh --with-toolset=gcc --with-libraries=filesystem,system,thread,serialization,test --without-icu
+CC= ./bootstrap.sh --with-toolset=gcc --with-libraries=filesystem,system,serialization,test --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 --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 ..
@@ -475,7 +477,7 @@ CC= CXX= ./configure \
 	-skip qtwebchannel \
 	-skip qtwebsockets \
 	-skip qtxmlpatterns \
-	-opensource -confirm-license -silent
+	-opensource -confirm-license -silent -no-warnings-are-errors
 export ANDROID_API_VERSION=android-$VER_AND_API
 export ANDROID_BUILD_TOOLS_REVISION=$VER_AND_BT
 make module-qtbase module-qtandroidextras module-qtsvg module-qtimageformats $PARALLEL $V