sigrok-cross-android: Temporary workaround to fix the PulseView build.

[sigrok-util.git] / cross-compile / android / sigrok-cross-android

diff --git a/cross-compile/android/sigrok-cross-android b/cross-compile/android/sigrok-cross-android
index f919cd09ce87f6abceb312a6d1fbaa4d8d13a29d..349ab1a77f7ca68f857d40201abb33d07d0a669c 100755 (executable)
--- a/cross-compile/android/sigrok-cross-android
+++ b/cross-compile/android/sigrok-cross-android
@@ -77,7 +77,7 @@ VER_LIBFTDI1=1.2
 VER_LIBUSB=1.0.19
 VER_PYTHON=3.3.3
 VER_BOOST=1.58.0
-VER_QT=5.4.1
+VER_QT=5.5.1
 VER_SIGROK_FIRMWARE_FX2LAFW=0.1.2
 VER_NDK=10e
 VER_SDK=24.3.3
@@ -496,9 +496,9 @@ find $PREFIX -iname "*.so" -exec ${TOOLCHAIN_TRIPLET}-strip -S {} \;
 # PulseView
 $GIT_CLONE git://sigrok.org/pulseview
 cd pulseview
+patch -p1 < ../../pv_cmake_pkgconfig_fix.patch
 cmake $CM -DENABLE_TESTS=y .
 make $PARALLEL $V
-make install $V
 ${TOOLCHAIN_TRIPLET}-strip -S libs/$TARGET_ARCH/libpulseview.so
 cd android
 "${ANDROID_SDK}/tools/android" update project -p . -t android-$VER_AND_API -n PulseView