From: Uwe Hermann <redacted>
Date: Tue, 2 Feb 2016 18:50:15 +0000 (+0100)
Subject: sigrok-cross-android: Temporary workaround to fix the PulseView build.
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=022952e3817dfe2e7f742176de1d735d4ff44ef9;p=sigrok-util.git

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

diff --git a/cross-compile/android/pv_cmake_pkgconfig_fix.patch b/cross-compile/android/pv_cmake_pkgconfig_fix.patch
new file mode 100644
index 0000000..dabd629
--- /dev/null
+++ b/cross-compile/android/pv_cmake_pkgconfig_fix.patch
@@ -0,0 +1,12 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index e21ace6..cdec391 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -20,6 +20,7 @@
+ 
+ cmake_minimum_required(VERSION 2.8.6)
+ 
++include(FindPkgConfig)
+ include(GNUInstallDirs)
+ 
+ project(pulseview)
diff --git a/cross-compile/android/sigrok-cross-android b/cross-compile/android/sigrok-cross-android
index 1216bbc..349ab1a 100755
--- a/cross-compile/android/sigrok-cross-android
+++ b/cross-compile/android/sigrok-cross-android
@@ -496,6 +496,7 @@ 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
 ${TOOLCHAIN_TRIPLET}-strip -S libs/$TARGET_ARCH/libpulseview.so