|
| 1 | +diff --git a/build-android.sh b/build-android.sh |
| 2 | +index 7aa2eee..5e621af 100755 |
| 3 | +--- a/build-android.sh |
| 4 | ++++ b/build-android.sh |
| 5 | +@@ -28,9 +28,9 @@ |
| 6 | + # ----------------------- |
| 7 | + |
| 8 | + BOOST_VER1=1 |
| 9 | +-BOOST_VER2=53 |
| 10 | ++BOOST_VER2=55 |
| 11 | + BOOST_VER3=0 |
| 12 | +-register_option "--boost=<version>" boost_version "Boost version to be used, one of {1.55.0,1.54.0,1.53.0,1.49.0, 1.48.0, 1.45.0}, default is 1.53.0." |
| 13 | ++register_option "--boost=<version>" boost_version "Boost version to be used, one of {1.55.0,1.54.0,1.53.0,1.49.0, 1.48.0, 1.45.0}, default is 1.55.0." |
| 14 | + boost_version() |
| 15 | + { |
| 16 | + if [ "$1" = "1.55.0" ]; then |
| 17 | +@@ -82,7 +82,7 @@ do_download () |
| 18 | + CLEAN=yes |
| 19 | + } |
| 20 | + |
| 21 | +-LIBRARIES=--with-libraries=date_time,filesystem,program_options,regex,signals,system,thread,iostreams |
| 22 | ++LIBRARIES=--with-libraries=locale,random,date_time,filesystem,system,thread,chrono,locale |
| 23 | + |
| 24 | + register_option "--with-libraries=<list>" do_with_libraries "Comma separated list of libraries to build." |
| 25 | + do_with_libraries () { LIBRARIES="--with-libraries=$1"; } |
| 26 | +@@ -245,7 +245,7 @@ case "$NDK_RN" in |
| 27 | + TOOLSET=gcc-androidR8e |
| 28 | + ;; |
| 29 | + "9 (64-bit)"|"9b (64-bit)"|"9c (64-bit)"|"9d (64-bit)") |
| 30 | +- TOOLCHAIN=${TOOLCHAIN:-arm-linux-androideabi-4.6} |
| 31 | ++ TOOLCHAIN=${TOOLCHAIN:-arm-linux-androideabi-4.8} |
| 32 | + CXXPATH=$AndroidNDKRoot/toolchains/${TOOLCHAIN}/prebuilt/${PlatformOS}-x86_64/bin/arm-linux-androideabi-g++ |
| 33 | + TOOLSET=gcc-androidR8e |
| 34 | + ;; |
| 35 | +@@ -314,7 +314,7 @@ then |
| 36 | + exit 1 |
| 37 | + fi |
| 38 | + cd $PROGDIR |
| 39 | +- |
| 40 | ++ |
| 41 | + # ------------------------------------------------------------- |
| 42 | + # Patching will be done only if we had a successfull bootstrap! |
| 43 | + # ------------------------------------------------------------- |
| 44 | +@@ -376,8 +376,12 @@ echo "Building boost for android" |
| 45 | + link=static \ |
| 46 | + threading=multi \ |
| 47 | + --layout=versioned \ |
| 48 | +- install 2>&1 \ |
| 49 | +- || { dump "ERROR: Failed to build boost for android!" ; exit 1 ; } |
| 50 | ++ --build-type=complete \ |
| 51 | ++ boost.locale.posix=off \ |
| 52 | ++ boost.locale.std=on \ |
| 53 | ++ -sICONV_PATH="`pwd`/../../libiconv/r9d-9-armeabiv7a" \ |
| 54 | ++ -s"NO_BZIP2=1" \ |
| 55 | ++ install 2>&1 |
| 56 | + } | tee -a $PROGDIR/build.log |
| 57 | + |
| 58 | + # PIPESTATUS variable is defined only in Bash, and we are using /bin/sh, which is not Bash on newer Debian/Ubuntu |
| 59 | +diff --git a/configs/user-config-boost-1_55_0.jam b/configs/user-config-boost-1_55_0.jam |
| 60 | +index 666d4c8..8250029 100644 |
| 61 | +--- a/configs/user-config-boost-1_55_0.jam |
| 62 | ++++ b/configs/user-config-boost-1_55_0.jam |
| 63 | +@@ -39,84 +39,38 @@ |
| 64 | + |
| 65 | + import os ; |
| 66 | + local AndroidNDKRoot = [ os.environ AndroidNDKRoot ] ; |
| 67 | ++local ToolChainPath = $(AndroidNDKRoot)/toolchains/arm-linux-androideabi-4.8/prebuilt/linux-x86_64 ; |
| 68 | ++local ToolChainBinPath = $(ToolChainPath)/bin ; |
| 69 | + |
| 70 | +-# -------------------------------------------------------------------- |
| 71 | +-# Is same for 8b, 8c and 8d |
| 72 | +-using gcc : androidR8b |
| 73 | +-: |
| 74 | +-arm-linux-androideabi-g++ |
| 75 | +-: |
| 76 | +-<archiver>arm-linux-androideabi-ar |
| 77 | +-<compileflags>-fexceptions |
| 78 | +-<compileflags>-frtti |
| 79 | +-<compileflags>-fpic |
| 80 | +-<compileflags>-ffunction-sections |
| 81 | +-<compileflags>-funwind-tables |
| 82 | +-<compileflags>-D__ARM_ARCH_5__ |
| 83 | +-<compileflags>-D__ARM_ARCH_5T__ |
| 84 | +-<compileflags>-D__ARM_ARCH_5E__ |
| 85 | +-<compileflags>-D__ARM_ARCH_5TE__ |
| 86 | +-<compileflags>-Wno-psabi |
| 87 | +-<compileflags>-march=armv5te |
| 88 | +-<compileflags>-mtune=xscale |
| 89 | +-<compileflags>-msoft-float |
| 90 | +-<compileflags>-mthumb |
| 91 | +-<compileflags>-Os |
| 92 | +-<compileflags>-fomit-frame-pointer |
| 93 | +-<compileflags>-fno-strict-aliasing |
| 94 | +-<compileflags>-finline-limit=64 |
| 95 | +-<compileflags>-I$(AndroidNDKRoot)/platforms/android-9/arch-arm/usr/include |
| 96 | +-<compileflags>-Wa,--noexecstack |
| 97 | +-<compileflags>-DANDROID |
| 98 | +-<compileflags>-D__ANDROID__ |
| 99 | +-<compileflags>-DNDEBUG |
| 100 | +-<compileflags>-O2 |
| 101 | +-<compileflags>-g |
| 102 | +-<compileflags>-I$(AndroidNDKRoot)/sources/cxx-stl/gnu-libstdc++/4.6/include |
| 103 | +-<compileflags>-I$(AndroidNDKRoot)/sources/cxx-stl/gnu-libstdc++/4.6/libs/armeabi/include |
| 104 | +-# @Moss - Above are the 'oficial' android flags |
| 105 | +-<architecture>arm |
| 106 | +-<compileflags>-fvisibility=hidden |
| 107 | +-<compileflags>-fvisibility-inlines-hidden |
| 108 | +-<compileflags>-fdata-sections |
| 109 | +-<cxxflags>-D__arm__ |
| 110 | +-<cxxflags>-D_REENTRANT |
| 111 | +-<cxxflags>-D_GLIBCXX__PTHREADS |
| 112 | +-; |
| 113 | +- |
| 114 | +-# -------------------------------------------------------------------- |
| 115 | + using gcc : androidR8e |
| 116 | + : |
| 117 | +-arm-linux-androideabi-g++ |
| 118 | ++$(ToolChainBinPath)/arm-linux-androideabi-g++ |
| 119 | + : |
| 120 | +-<archiver>arm-linux-androideabi-ar |
| 121 | + <compileflags>-fexceptions |
| 122 | + <compileflags>-frtti |
| 123 | + <compileflags>-fpic |
| 124 | + <compileflags>-ffunction-sections |
| 125 | + <compileflags>-funwind-tables |
| 126 | +-<compileflags>-D__ARM_ARCH_5__ |
| 127 | +-<compileflags>-D__ARM_ARCH_5T__ |
| 128 | +-<compileflags>-D__ARM_ARCH_5E__ |
| 129 | +-<compileflags>-D__ARM_ARCH_5TE__ |
| 130 | +-<compileflags>-Wno-psabi |
| 131 | +-<compileflags>-march=armv5te |
| 132 | ++<compileflags>-Wno-pedantic |
| 133 | ++<compileflags>-march=armv7-a |
| 134 | + <compileflags>-mtune=xscale |
| 135 | + <compileflags>-msoft-float |
| 136 | + <compileflags>-mthumb |
| 137 | ++<compileflags>-O2 |
| 138 | + <compileflags>-Os |
| 139 | ++<compileflags>-g |
| 140 | ++<compileflags>-DNDEBUG |
| 141 | + <compileflags>-fomit-frame-pointer |
| 142 | + <compileflags>-fno-strict-aliasing |
| 143 | +-<compileflags>-finline-limit=64 |
| 144 | +-<compileflags>-I$(AndroidNDKRoot)/platforms/android-9/arch-arm/usr/include |
| 145 | +-<compileflags>-Wa,--noexecstack |
| 146 | ++<compileflags>-I$(AndroidNDKRoot)/sources/cxx-stl/gnu-libstdc++/4.8/include |
| 147 | ++<compileflags>-I$(AndroidNDKRoot)/sources/cxx-stl/gnu-libstdc++/4.8/libs/armeabi-v7a/include |
| 148 | ++<compileflags>-I$(AndroidNDKRoot)/sources/cxx-stl/gnu-libstdc++/4.8/include/backward |
| 149 | ++<compileflags>--sysroot=$(AndroidNDKRoot)/platforms/android-9/arch-arm |
| 150 | + <compileflags>-DANDROID |
| 151 | + <compileflags>-D__ANDROID__ |
| 152 | +-<compileflags>-DNDEBUG |
| 153 | +-<compileflags>-O2 |
| 154 | +-<compileflags>-g |
| 155 | +-<compileflags>-I$(AndroidNDKRoot)/sources/cxx-stl/gnu-libstdc++/4.6/include |
| 156 | +-<compileflags>-I$(AndroidNDKRoot)/sources/cxx-stl/gnu-libstdc++/4.6/libs/armeabi/include |
| 157 | ++<compileflags>-Wa,--noexecstack |
| 158 | ++<cxxflags>-std=c++11 |
| 159 | ++<linkflags>--sysroot=$(AndroidNDKRoot)/platforms/android-9/arch-arm |
| 160 | + # @Moss - Above are the 'oficial' android flags |
| 161 | + <architecture>arm |
| 162 | + <compileflags>-fvisibility=hidden |
| 163 | +@@ -125,9 +79,10 @@ arm-linux-androideabi-g++ |
| 164 | + <cxxflags>-D__arm__ |
| 165 | + <cxxflags>-D_REENTRANT |
| 166 | + <cxxflags>-D_GLIBCXX__PTHREADS |
| 167 | ++<cxxflags>-D_BOOST_SYSTEM_NO_DEPRECATED |
| 168 | ++<cxxflags>-D_NO_BZIP2 |
| 169 | + ; |
| 170 | + |
| 171 | +- |
| 172 | + # ------------------ |
| 173 | + # GCC configuration. |
| 174 | + # ------------------ |
0 commit comments