From: Marcus Comstedt <redacted>
Date: Thu, 15 Aug 2013 13:07:25 +0000 (+0200)
Subject: sigrok-cross-android: Avoid building C++ libraries
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=091ed535afe1849f70c50aaea71b75fee760a670;p=sigrok-util.git

sigrok-cross-android: Avoid building C++ libraries

The Android NDK doesn't ship C++ includes, so skip building C++
support in libpcre and libusb (we don't need it anyway).
---

diff --git a/cross-compile/android/sigrok-cross-android b/cross-compile/android/sigrok-cross-android
index 825bc15..36de775 100755
--- a/cross-compile/android/sigrok-cross-android
+++ b/cross-compile/android/sigrok-cross-android
@@ -103,7 +103,7 @@ cd ..
 wget ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-$VER_PCRE.tar.gz
 tar xfvz pcre-$VER_PCRE.tar.gz
 cd pcre-$VER_PCRE
-./configure $C
+./configure $C --disable-cpp
 make
 make install
 cd ..
@@ -145,8 +145,9 @@ cd libusb-$VER_LIBUSB
 cp -f ../config/config.guess .
 cp -f ../config/config.sub .
 ./configure $C
-make
-make install
+# explicitly exclude libusbpp.la from lib_LTLIBRARIES, and skip subdirs
+make lib_LTLIBRARIES=libusb.la SUBDIRS=.
+make lib_LTLIBRARIES=libusb.la SUBDIRS=. install
 cd ..
 
 # libftdi