Skip to content

Commit 00b0915

Browse files
ras0219-msftras0219-msft
committed
Updated boost-for-android patches to work with r10e
1 parent 2e3bde4 commit 00b0915

2 files changed

Lines changed: 22 additions & 12 deletions

File tree

‎Build_android/boost-for-android-x86.patch‎

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
diff --git a/build-android.sh b/build-android.sh
2-
index 40453f7..86f0cff 100755
2+
index 40453f7..7ffc050 100755
33
--- a/build-android.sh
44
+++ b/build-android.sh
5-
@@ -258,9 +258,9 @@ case "$NDK_RN" in
5+
@@ -258,9 +258,14 @@ case "$NDK_RN" in
66
TOOLSET=gcc-androidR8e
77
;;
88
"10 (64-bit)")
@@ -11,19 +11,24 @@ index 40453f7..86f0cff 100755
1111
- TOOLSET=gcc-androidR8e
1212
+ TOOLCHAIN=llvm-3.4
1313
+ CXXPATH=$AndroidNDKRoot/toolchains/${TOOLCHAIN}/prebuilt/${PlatformOS}-x86_64/bin/clang++
14+
+ TOOLSET=clang-androidR8e
15+
+ ;;
16+
+ "10e-rc4 (64-bit)")
17+
+ TOOLCHAIN=llvm-3.6
18+
+ CXXPATH=$AndroidNDKRoot/toolchains/${TOOLCHAIN}/prebuilt/${PlatformOS}-x86_64/bin/clang++
1419
+ TOOLSET=clang-androidR8e
1520
;;
1621
*)
1722
echo "Undefined or not supported Android NDK version!"
18-
@@ -392,6 +392,7 @@ echo "Building boost for android"
23+
@@ -392,6 +397,7 @@ echo "Building boost for android"
1924
export PATH=$AndroidBinariesPath:$PATH
2025
export AndroidNDKRoot
2126
export NO_BZIP2=1
2227
+ export ICONV_PATH="`pwd`/../../libiconv/x86"
2328

2429
cxxflags=""
2530
for flag in $CXXFLAGS; do cxxflags="$cxxflags cxxflags=$flag"; done
26-
@@ -404,8 +405,12 @@ echo "Building boost for android"
31+
@@ -404,8 +410,12 @@ echo "Building boost for android"
2732
threading=multi \
2833
--layout=versioned \
2934
--prefix="./../$BUILD_DIR/" \
@@ -38,7 +43,7 @@ index 40453f7..86f0cff 100755
3843
} | tee -a $PROGDIR/build.log
3944

4045
diff --git a/configs/user-config-boost-1_55_0.jam b/configs/user-config-boost-1_55_0.jam
41-
index 666d4c8..9c2f67f 100644
46+
index 666d4c8..762753e 100644
4247
--- a/configs/user-config-boost-1_55_0.jam
4348
+++ b/configs/user-config-boost-1_55_0.jam
4449
@@ -41,91 +41,44 @@ import os ;
@@ -50,7 +55,7 @@ index 666d4c8..9c2f67f 100644
5055
+using clang : androidR8e
5156
:
5257
-arm-linux-androideabi-g++
53-
+$(AndroidNDKRoot)/toolchains/llvm-3.4/prebuilt/linux-x86_64/bin/clang++
58+
+$(AndroidNDKRoot)/toolchains/llvm-3.6/prebuilt/linux-x86_64/bin/clang++
5459
:
5560
-<archiver>arm-linux-androideabi-ar
5661
+<compileflags>--gcc-toolchain="$(AndroidNDKRoot)/toolchains/x86-4.8/prebuilt/linux-x86_64"

‎Build_android/boost-for-android.patch‎

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
diff --git a/build-android.sh b/build-android.sh
2-
index 40453f7..97a3203 100755
2+
index 40453f7..ad78ddf 100755
33
--- a/build-android.sh
44
+++ b/build-android.sh
5-
@@ -258,9 +258,9 @@ case "$NDK_RN" in
5+
@@ -258,9 +258,14 @@ case "$NDK_RN" in
66
TOOLSET=gcc-androidR8e
77
;;
88
"10 (64-bit)")
@@ -11,19 +11,24 @@ index 40453f7..97a3203 100755
1111
- TOOLSET=gcc-androidR8e
1212
+ TOOLCHAIN=llvm-3.4
1313
+ CXXPATH=$AndroidNDKRoot/toolchains/${TOOLCHAIN}/prebuilt/${PlatformOS}-x86_64/bin/clang++
14+
+ TOOLSET=clang-androidR8e
15+
+ ;;
16+
+ "10e-rc4 (64-bit)")
17+
+ TOOLCHAIN=llvm-3.6
18+
+ CXXPATH=$AndroidNDKRoot/toolchains/${TOOLCHAIN}/prebuilt/${PlatformOS}-x86_64/bin/clang++
1419
+ TOOLSET=clang-androidR8e
1520
;;
1621
*)
1722
echo "Undefined or not supported Android NDK version!"
18-
@@ -392,6 +392,7 @@ echo "Building boost for android"
23+
@@ -392,6 +397,7 @@ echo "Building boost for android"
1924
export PATH=$AndroidBinariesPath:$PATH
2025
export AndroidNDKRoot
2126
export NO_BZIP2=1
2227
+ export ICONV_PATH="`pwd`/../../libiconv/armeabi-v7a"
2328

2429
cxxflags=""
2530
for flag in $CXXFLAGS; do cxxflags="$cxxflags cxxflags=$flag"; done
26-
@@ -404,8 +405,12 @@ echo "Building boost for android"
31+
@@ -404,8 +410,12 @@ echo "Building boost for android"
2732
threading=multi \
2833
--layout=versioned \
2934
--prefix="./../$BUILD_DIR/" \
@@ -38,7 +43,7 @@ index 40453f7..97a3203 100755
3843
} | tee -a $PROGDIR/build.log
3944

4045
diff --git a/configs/user-config-boost-1_55_0.jam b/configs/user-config-boost-1_55_0.jam
41-
index 666d4c8..5f6bab8 100644
46+
index 666d4c8..df597f6 100644
4247
--- a/configs/user-config-boost-1_55_0.jam
4348
+++ b/configs/user-config-boost-1_55_0.jam
4449
@@ -41,82 +41,41 @@ import os ;
@@ -50,7 +55,7 @@ index 666d4c8..5f6bab8 100644
5055
+using clang : androidR8e
5156
:
5257
-arm-linux-androideabi-g++
53-
+$(AndroidNDKRoot)/toolchains/llvm-3.4/prebuilt/linux-x86_64/bin/clang++
58+
+$(AndroidNDKRoot)/toolchains/llvm-3.6/prebuilt/linux-x86_64/bin/clang++
5459
:
5560
-<archiver>arm-linux-androideabi-ar
5661
+<compileflags>--gcc-toolchain="$(AndroidNDKRoot)/toolchains/arm-linux-androideabi-4.8/prebuilt/linux-x86_64"

0 commit comments

Comments
 (0)