X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-util.git;a=blobdiff_plain;f=cross-compile%2Fandroid%2Fboost.patch;fp=cross-compile%2Fandroid%2Fboost.patch;h=31a5872ee061bcdd63c52da832ff416dfd6ec15f;hp=0000000000000000000000000000000000000000;hb=11b9792eac7af42916f6e854400b5cc5ca942247;hpb=a1c891a9f2500c678603900447015083943f96ec

diff --git a/cross-compile/android/boost.patch b/cross-compile/android/boost.patch
new file mode 100644
index 0000000..31a5872
--- /dev/null
+++ b/cross-compile/android/boost.patch
@@ -0,0 +1,23 @@
+diff -urp boost_1_55_0.orig/tools/build/v2/tools/builtin.jam boost_1_55_0/tools/build/v2/tools/builtin.jam
+--- boost_1_55_0.orig/tools/build/v2/tools/builtin.jam	2014-04-04 20:31:24.240657506 +0200
++++ boost_1_55_0/tools/build/v2/tools/builtin.jam	2014-04-04 20:31:38.951319126 +0200
+@@ -41,7 +41,7 @@ import generate ;
+ 
+ 
+ .os-names = aix bsd cygwin darwin freebsd hpux iphone linux netbsd openbsd osf
+-    qnx qnxnto sgi solaris unix unixware windows
++    qnx qnxnto sgi solaris unix unixware windows android
+     elf  # Not actually an OS -- used for targeting bare metal where object
+          # format is ELF.  This catches both -elf and -eabi gcc targets and well
+          # as other compilers targeting ELF. It is not clear how often we need
+diff -urp boost_1_55_0.orig/tools/build/v2/tools/gcc.jam boost_1_55_0/tools/build/v2/tools/gcc.jam
+--- boost_1_55_0.orig/tools/build/v2/tools/gcc.jam	2014-04-04 20:22:10.431667807 +0200
++++ boost_1_55_0/tools/build/v2/tools/gcc.jam	2014-04-04 20:35:34.859039773 +0200
+@@ -1032,6 +1032,7 @@ rule setup-threading ( targets * : sourc
+             case *bsd    : option = -pthread ;  # There is no -lrt on BSD.
+             case sgi     : # gcc on IRIX does not support multi-threading.
+             case darwin  : # No threading options.
++            case android : # No threading options.
+             case *       : option = -pthread ; libs = rt ;
+         }
+