From: Marcus Comstedt <redacted>
Date: Mon, 19 Jan 2015 12:36:35 +0000 (+0100)
Subject: sigrok-cross-android: Bump Boost version to 1.57
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=0263ef056a1921341df5a9fc617cc2573ceb60dc;p=sigrok-util.git

sigrok-cross-android: Bump Boost version to 1.57
---

diff --git a/cross-compile/android/boost.patch b/cross-compile/android/boost.patch
deleted file mode 100644
index 31a5872..0000000
--- a/cross-compile/android/boost.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-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 ;
-         }
- 
diff --git a/cross-compile/android/sigrok-cross-android b/cross-compile/android/sigrok-cross-android
index 223363e..17602b0 100755
--- a/cross-compile/android/sigrok-cross-android
+++ b/cross-compile/android/sigrok-cross-android
@@ -70,7 +70,7 @@ VER_LIBZIP=0.11.2
 VER_LIBFTDI1=1.1
 VER_LIBUSB=1.0.19
 VER_PYTHON=3.3.3
-VER_BOOST=1.55.0
+VER_BOOST=1.57.0
 VER_QT=5.3.1
 VER_NDK=10d
 VER_SDK=23.0.2
@@ -409,10 +409,9 @@ NDK_HOST=`"$ANDROID_NDK/ndk-build" -p 2>/dev/null | awk '$1 == "HOST_TAG" { prin
 $WGET http://$SF_MIRROR/project/boost/boost/$VER_BOOST/boost_${VER_BOOST//./_}.tar.bz2
 tar xfj boost_${VER_BOOST//./_}.tar.bz2
 cd boost_${VER_BOOST//./_}
-patch -p1 < ../../boost.patch
 CC= ./bootstrap.sh --with-toolset=gcc --with-libraries=filesystem,system,thread --without-icu
 echo "using gcc : $NDK_TOOLCHAIN_VERSION : \"${TOOLCHAIN_TRIPLET}-g++\" : <cxxflags>\"$SYSROOT -I$PREFIX/include $CPPFLAGS_STL\" <linkflags>\"$SYSROOT -L$PREFIX/lib $LDFLAGS_STL -lgnustl_shared\" ;" > user-config.jam
-./b2 -q -d+2 --user-config=user-config.jam toolset=gcc variant=release link=shared threading=multi runtime-link=shared target-os=android --prefix=$PREFIX --layout=system install $PARALLEL
+./b2 -q -d+2 --ignore-site-config --user-config=user-config.jam toolset=gcc variant=release link=shared threading=multi runtime-link=shared target-os=android --prefix=$PREFIX --layout=system install $PARALLEL
 cd ..
 
 # Qt (needed for PulseView)