Skip to content

Commit 1253ad2

Browse files
committed
Switched boost-for-android to produce debug and release versions of binaries
1 parent 77682eb commit 1253ad2

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

Build_android/boost-for-android.patch

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
diff --git a/build-android.sh b/build-android.sh
2-
index 40453f7..0bd39ae 100755
2+
index 40453f7..dd92f74 100755
33
--- a/build-android.sh
44
+++ b/build-android.sh
55
@@ -258,9 +258,9 @@ case "$NDK_RN" in
@@ -23,7 +23,7 @@ index 40453f7..0bd39ae 100755
2323

2424
cxxflags=""
2525
for flag in $CXXFLAGS; do cxxflags="$cxxflags cxxflags=$flag"; done
26-
@@ -404,6 +405,10 @@ echo "Building boost for android"
26+
@@ -404,8 +405,12 @@ echo "Building boost for android"
2727
threading=multi \
2828
--layout=versioned \
2929
--prefix="./../$BUILD_DIR/" \
@@ -32,8 +32,11 @@ index 40453f7..0bd39ae 100755
3232
+ boost.locale.iconv=on \
3333
+ boost.locale.icu=off \
3434
$LIBRARIES \
35-
install 2>&1 \
35+
- install 2>&1 \
36+
+ release debug install 2>&1 \
3637
|| { dump "ERROR: Failed to build boost for android!" ; exit 1 ; }
38+
} | tee -a $PROGDIR/build.log
39+
3740
diff --git a/configs/user-config-boost-1_55_0.jam b/configs/user-config-boost-1_55_0.jam
3841
index 666d4c8..5f6bab8 100644
3942
--- a/configs/user-config-boost-1_55_0.jam

Build_android/configure.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ DO_BOOST=1
3939
DO_OPENSSL=1
4040

4141
function usage {
42-
echo "Usage: $0 [--skip-boost] [--skip-openssl] [-h] [--ndk <android-ndk>]"
42+
echo "Usage: $0 [--skip-boost] [--skip-openssl] [--skip-libiconv] [-h] [--ndk <android-ndk>]"
4343
echo ""
4444
echo " --skip-boost Skip fetching and compiling boost"
4545
echo " --skip-openssl Skip fetching and compiling openssl"

0 commit comments

Comments
 (0)