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 825bc154b9cead85e4005e7bc563952f415c30e7..36de77562cc13f18ff89e851b89baf2f3ae46cf0 100755 (executable)
--- 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