sigrok-cross-android: Use new libftdi1, drop libusb-0.1

[sigrok-util.git] / cross-compile / android / android.toolchain.cmake.patch

diff --git a/cross-compile/android/android.toolchain.cmake.patch b/cross-compile/android/android.toolchain.cmake.patch
new file mode 100644 (file)
index 0000000..79b97ed
--- /dev/null
+++ b/cross-compile/android/android.toolchain.cmake.patch
@@ -0,0 +1,35 @@
+--- android.toolchain.cmake.orig       2014-04-06 16:08:25.765699476 +0200
++++ android.toolchain.cmake    2014-04-06 16:22:30.671987319 +0200
+@@ -464,7 +464,7 @@ if( BUILD_WITH_STANDALONE_TOOLCHAIN )
+  else()\r
+   execute_process( COMMAND "${ANDROID_STANDALONE_TOOLCHAIN}/bin/${__availableToolchainMachines}-gcc${TOOL_OS_SUFFIX}" --version\r
+    OUTPUT_VARIABLE __availableToolchainCompilerVersions OUTPUT_STRIP_TRAILING_WHITESPACE )\r
+-  string( REGEX MATCH "[0-9]+.[0-9]+.[0-9]+" __availableToolchainCompilerVersions "${__availableToolchainCompilerVersions}" )\r
++  string( REGEX MATCH "[0-9]+(\\.[0-9]+)+" __availableToolchainCompilerVersions "${__availableToolchainCompilerVersions}" )\r
+  endif()\r
+ endif()\r
+ \r
+@@ -667,7 +667,12 @@ endif()
+ if( BUILD_WITH_STANDALONE_TOOLCHAIN )\r
+  set( ANDROID_TOOLCHAIN_ROOT "${ANDROID_STANDALONE_TOOLCHAIN}" )\r
+  set( ANDROID_SYSROOT "${ANDROID_STANDALONE_TOOLCHAIN}/sysroot" )\r
+- set( __stlLibPath "${ANDROID_STANDALONE_TOOLCHAIN}/${ANDROID_TOOLCHAIN_MACHINE_NAME}/lib" )\r
++ if (NOT DEFINED ANDROID_STL_PATH)\r
++  set( __stlLibPath "${ANDROID_STANDALONE_TOOLCHAIN}/${ANDROID_TOOLCHAIN_MACHINE_NAME}/lib" )\r
++ else()\r
++   set( __stlIncludePath "${ANDROID_STL_PATH}/gnu-libstdc++/${ANDROID_COMPILER_VERSION}/include" )\r
++   set( __stlLibPath "${ANDROID_STL_PATH}/gnu-libstdc++/${ANDROID_COMPILER_VERSION}/libs/${ANDROID_NDK_ABI_NAME}" )\r
++ endif()\r
+ endif()\r
+ if( BUILD_WITH_ANDROID_NDK )\r
+  set( ANDROID_TOOLCHAIN_ROOT "${ANDROID_NDK}/toolchains/${ANDROID_TOOLCHAIN_NAME}/prebuilt/${ANDROID_NDK_HOST_SYSTEM_NAME}" )\r
+@@ -732,6 +737,9 @@ list( APPEND ANDROID_SYSTEM_INCLUDE_DIRS
+ if( __stlIncludePath AND EXISTS "${__stlIncludePath}" )\r
+  list( APPEND ANDROID_SYSTEM_INCLUDE_DIRS "${__stlIncludePath}" )\r
+ endif()\r
++if( __stlLibPath AND EXISTS "${__stlLibPath}/include" )\r
++ list( APPEND ANDROID_SYSTEM_INCLUDE_DIRS "${__stlLibPath}/include" )\r
++endif()\r
+ \r
+ # c++ bits includes\r
+ if( __stlLibPath AND EXISTS "${__stlLibPath}/include" )\r