Update android-*-boost to 1.71.0
This commit is contained in:
parent
d537802773
commit
6e992767cd
|
|
@ -16,10 +16,10 @@ _boost_arch=arm
|
|||
_boost_address_model=64
|
||||
|
||||
pkgname=android-$_pkg_arch-$_pkgname
|
||||
pkgver=1.69.0
|
||||
pkgver=1.71.0
|
||||
_boostver=${pkgver//./_}
|
||||
pkgrel=1
|
||||
url='http://www.boost.org/'
|
||||
url='https://www.boost.org/'
|
||||
arch=('any')
|
||||
license=('custom')
|
||||
pkgdesc="Free peer-reviewed portable C++ source libraries (Android, $_pkg_arch)"
|
||||
|
|
@ -28,14 +28,17 @@ options=(!buildflags staticlibs !strip !emptydirs)
|
|||
makedepends=('bzip2' 'zlib' 'android-ndk' 'android-sdk')
|
||||
conflicts=("android-$_pkgname-$_android_arch")
|
||||
replaces=("android-$_pkgname-$_android_arch")
|
||||
source=(https://downloads.sourceforge.net/project/${_pkgname}/${_pkgname}/${pkgver}/${_pkgname}_${_boostver}.tar.bz2
|
||||
no-versioned-shlibs.patch)
|
||||
sha256sums=('8f32d4617390d1c2d16f26a27ab60d97807b35440d45891fa340fc2648b04406'
|
||||
'd82d0f15064812dcabb3456a7bcb1db0e0f6145980e4728e638372e0fd35af23')
|
||||
source=(https://dl.bintray.com/boostorg/release/${pkgver}/source/boost_${_boostver}.tar.bz2
|
||||
no-versioned-shlibs.patch
|
||||
disable-version-check.patch)
|
||||
sha256sums=('d73a8da01e8bf8c7eda40b4c84915071a8c8a0df4a6734537ddde4a8580524ee'
|
||||
'd82d0f15064812dcabb3456a7bcb1db0e0f6145980e4728e638372e0fd35af23'
|
||||
'13d7ed51d05dba2dfe04d9929bf0091505883567178586d0b482b0900a684848')
|
||||
|
||||
prepare() {
|
||||
cd ${_pkgname}_${_boostver}
|
||||
patch -i ../no-versioned-shlibs.patch
|
||||
patch -p1 -i ../disable-version-check.patch
|
||||
}
|
||||
|
||||
build() {
|
||||
|
|
@ -67,9 +70,7 @@ build() {
|
|||
|
||||
./bootstrap.sh --with-toolset=gcc
|
||||
|
||||
_bindir="bin.linuxx86"
|
||||
[[ "${CARCH}" = "x86_64" ]] && _bindir="bin.linuxx86_64"
|
||||
install -Dm755 tools/build/src/engine/$_bindir/b2 "${_stagedir}"/bin/b2
|
||||
install -Dm755 tools/build/src/engine/b2 "${_stagedir}"/bin/b2
|
||||
|
||||
# Support for OpenMPI
|
||||
echo "using mpi ;" >> project-config.jam
|
||||
|
|
@ -121,7 +122,7 @@ build() {
|
|||
toolset=clang-android \
|
||||
architecture=$_boost_arch \
|
||||
address-model=$_boost_address_model \
|
||||
-sICONV_PATH="/opt/android-libs/$_android_arch" \
|
||||
-sICONV_PATH="/opt/android-libs/$_pkg_arch" \
|
||||
cflags="$common_flags" \
|
||||
cxxflags="$common_flags -fexceptions -frtti -std=c++14" \
|
||||
linkflags="$ld_flags" \
|
||||
|
|
@ -129,7 +130,6 @@ build() {
|
|||
${jobs} \
|
||||
\
|
||||
--prefix="${_stagedir}" \
|
||||
-d+2 \
|
||||
install
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,27 @@
|
|||
--- a/tools/build/src/tools/common.jam 2019-09-18 16:03:02.035995695 +0200
|
||||
+++ b/tools/build/src/tools/common.jam 2019-09-18 16:03:36.386156355 +0200
|
||||
@@ -974,16 +974,16 @@
|
||||
}
|
||||
|
||||
# From GCC 5, versioning changes and minor becomes patch
|
||||
- if $(tag) = gcc && [ numbers.less 4 $(version[1]) ]
|
||||
- {
|
||||
- version = $(version[1]) ;
|
||||
- }
|
||||
+ #if $(tag) = gcc && [ numbers.less 4 $(version[1]) ]
|
||||
+ #{
|
||||
+ # version = $(version[1]) ;
|
||||
+ #}
|
||||
|
||||
# Ditto, from Clang 4
|
||||
- if ( $(tag) = clang || $(tag) = clangw ) && [ numbers.less 3 $(version[1]) ]
|
||||
- {
|
||||
- version = $(version[1]) ;
|
||||
- }
|
||||
+ #if ( $(tag) = clang || $(tag) = clangw ) && [ numbers.less 3 $(version[1]) ]
|
||||
+ #{
|
||||
+ # version = $(version[1]) ;
|
||||
+ #}
|
||||
|
||||
# On intel, version is not added, because it does not matter and it is the
|
||||
# version of vc used as backend that matters. Ideally, we should encode the
|
||||
|
|
@ -16,10 +16,10 @@ _boost_arch=arm
|
|||
_boost_address_model=32
|
||||
|
||||
pkgname=android-$_pkg_arch-$_pkgname
|
||||
pkgver=1.69.0
|
||||
pkgver=1.71.0
|
||||
_boostver=${pkgver//./_}
|
||||
pkgrel=1
|
||||
url='http://www.boost.org/'
|
||||
url='https://www.boost.org/'
|
||||
arch=('any')
|
||||
license=('custom')
|
||||
pkgdesc="Free peer-reviewed portable C++ source libraries (Android, $_pkg_arch)"
|
||||
|
|
@ -28,14 +28,17 @@ options=(!buildflags staticlibs !strip !emptydirs)
|
|||
makedepends=('bzip2' 'zlib' 'android-ndk' 'android-sdk')
|
||||
conflicts=("android-$_pkgname-$_android_arch")
|
||||
replaces=("android-$_pkgname-$_android_arch")
|
||||
source=(https://downloads.sourceforge.net/project/${_pkgname}/${_pkgname}/${pkgver}/${_pkgname}_${_boostver}.tar.bz2
|
||||
no-versioned-shlibs.patch)
|
||||
sha256sums=('8f32d4617390d1c2d16f26a27ab60d97807b35440d45891fa340fc2648b04406'
|
||||
'd82d0f15064812dcabb3456a7bcb1db0e0f6145980e4728e638372e0fd35af23')
|
||||
source=(https://dl.bintray.com/boostorg/release/${pkgver}/source/boost_${_boostver}.tar.bz2
|
||||
no-versioned-shlibs.patch
|
||||
disable-version-check.patch)
|
||||
sha256sums=('d73a8da01e8bf8c7eda40b4c84915071a8c8a0df4a6734537ddde4a8580524ee'
|
||||
'd82d0f15064812dcabb3456a7bcb1db0e0f6145980e4728e638372e0fd35af23'
|
||||
'13d7ed51d05dba2dfe04d9929bf0091505883567178586d0b482b0900a684848')
|
||||
|
||||
prepare() {
|
||||
cd ${_pkgname}_${_boostver}
|
||||
patch -i ../no-versioned-shlibs.patch
|
||||
patch -p1 -i ../disable-version-check.patch
|
||||
}
|
||||
|
||||
build() {
|
||||
|
|
@ -67,9 +70,7 @@ build() {
|
|||
|
||||
./bootstrap.sh --with-toolset=gcc
|
||||
|
||||
_bindir="bin.linuxx86"
|
||||
[[ "${CARCH}" = "x86_64" ]] && _bindir="bin.linuxx86_64"
|
||||
install -Dm755 tools/build/src/engine/$_bindir/b2 "${_stagedir}"/bin/b2
|
||||
install -Dm755 tools/build/src/engine/b2 "${_stagedir}"/bin/b2
|
||||
|
||||
# Support for OpenMPI
|
||||
echo "using mpi ;" >> project-config.jam
|
||||
|
|
@ -121,7 +122,7 @@ build() {
|
|||
toolset=clang-android \
|
||||
architecture=$_boost_arch \
|
||||
address-model=$_boost_address_model \
|
||||
-sICONV_PATH="/opt/android-libs/$_android_arch" \
|
||||
-sICONV_PATH="/opt/android-libs/$_pkg_arch" \
|
||||
cflags="$common_flags" \
|
||||
cxxflags="$common_flags -fexceptions -frtti -std=c++14" \
|
||||
linkflags="$ld_flags" \
|
||||
|
|
@ -129,7 +130,6 @@ build() {
|
|||
${jobs} \
|
||||
\
|
||||
--prefix="${_stagedir}" \
|
||||
-d+2 \
|
||||
install
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,27 @@
|
|||
--- a/tools/build/src/tools/common.jam 2019-09-18 16:03:02.035995695 +0200
|
||||
+++ b/tools/build/src/tools/common.jam 2019-09-18 16:03:36.386156355 +0200
|
||||
@@ -974,16 +974,16 @@
|
||||
}
|
||||
|
||||
# From GCC 5, versioning changes and minor becomes patch
|
||||
- if $(tag) = gcc && [ numbers.less 4 $(version[1]) ]
|
||||
- {
|
||||
- version = $(version[1]) ;
|
||||
- }
|
||||
+ #if $(tag) = gcc && [ numbers.less 4 $(version[1]) ]
|
||||
+ #{
|
||||
+ # version = $(version[1]) ;
|
||||
+ #}
|
||||
|
||||
# Ditto, from Clang 4
|
||||
- if ( $(tag) = clang || $(tag) = clangw ) && [ numbers.less 3 $(version[1]) ]
|
||||
- {
|
||||
- version = $(version[1]) ;
|
||||
- }
|
||||
+ #if ( $(tag) = clang || $(tag) = clangw ) && [ numbers.less 3 $(version[1]) ]
|
||||
+ #{
|
||||
+ # version = $(version[1]) ;
|
||||
+ #}
|
||||
|
||||
# On intel, version is not added, because it does not matter and it is the
|
||||
# version of vc used as backend that matters. Ideally, we should encode the
|
||||
|
|
@ -0,0 +1,156 @@
|
|||
# Maintainer: Martchus <martchus@gmx.net>
|
||||
|
||||
# All my PKGBUILDs are managed at https://github.com/Martchus/PKGBUILDs where
|
||||
# you also find the URL of a binary repository.
|
||||
|
||||
_pkgname=boost
|
||||
_pkg_arch=x86-64
|
||||
_android_arch=x86_64
|
||||
_android_toolchain=x86_64-linux-android$_android_platform
|
||||
_android_platform=21 # https://developer.android.com/about/dashboards/
|
||||
_android_prefix=/opt/android-libs/$_pkg_arch
|
||||
_android_ndk_path=/opt/android-ndk
|
||||
_android_platform_arch=arch-x86_64
|
||||
_android_platform_dir=android-$_android_platform/${_android_platform_arch}
|
||||
_boost_arch=x86_64
|
||||
_boost_address_model=64
|
||||
|
||||
pkgname=android-$_pkg_arch-$_pkgname
|
||||
pkgver=1.71.0
|
||||
_boostver=${pkgver//./_}
|
||||
pkgrel=1
|
||||
url='https://www.boost.org/'
|
||||
arch=('any')
|
||||
license=('custom')
|
||||
pkgdesc="Free peer-reviewed portable C++ source libraries (Android, $_pkg_arch)"
|
||||
depends=("android-$_pkg_arch-libiconv")
|
||||
options=(!buildflags staticlibs !strip !emptydirs)
|
||||
makedepends=('bzip2' 'zlib' 'android-ndk' 'android-sdk')
|
||||
conflicts=("android-$_pkgname-$_android_arch")
|
||||
replaces=("android-$_pkgname-$_android_arch")
|
||||
source=(https://dl.bintray.com/boostorg/release/${pkgver}/source/boost_${_boostver}.tar.bz2
|
||||
no-versioned-shlibs.patch
|
||||
disable-version-check.patch)
|
||||
sha256sums=('d73a8da01e8bf8c7eda40b4c84915071a8c8a0df4a6734537ddde4a8580524ee'
|
||||
'd82d0f15064812dcabb3456a7bcb1db0e0f6145980e4728e638372e0fd35af23'
|
||||
'13d7ed51d05dba2dfe04d9929bf0091505883567178586d0b482b0900a684848')
|
||||
|
||||
prepare() {
|
||||
cd ${_pkgname}_${_boostver}
|
||||
patch -i ../no-versioned-shlibs.patch
|
||||
patch -p1 -i ../disable-version-check.patch
|
||||
}
|
||||
|
||||
build() {
|
||||
local _stagedir="${srcdir}/stagedir"
|
||||
local jobs="$(sed -e 's/.*\(-j *[0-9]\+\).*/\1/' <<< ${MAKEFLAGS})"
|
||||
local target_flags=" \
|
||||
--target=$_android_toolchain \
|
||||
--gcc-toolchain=$_android_ndk_path/toolchains/$_android_toolchain-4.9/prebuilt/linux-x86_64 \
|
||||
--sysroot=$_android_ndk_path/platforms/$_android_platform_dir/usr"
|
||||
local common_flags=" \
|
||||
$target_flags \
|
||||
-isystem $_android_ndk_path/sources/android/support/include \
|
||||
-isystem $_android_ndk_path/sources/cxx-stl/llvm-libc++/include \
|
||||
-isystem $_android_ndk_path/sources/cxx-stl/llvm-libc++abi/include \
|
||||
-isystem $_android_ndk_path/sysroot/usr/include \
|
||||
-isystem $_android_ndk_path/sysroot/usr/include/$_android_toolchain \
|
||||
-funwind-tables \
|
||||
-no-canonical-prefixes \
|
||||
-D__ANDROID_API__=$_android_platform \
|
||||
-O3 \
|
||||
-fPIC \
|
||||
-DBOOST_ASIO_HAS_STD_STRING_VIEW=1"
|
||||
local ld_flags=" \
|
||||
$target_flags \
|
||||
$_android_ndk_path/sources/cxx-stl/llvm-libc++/libs/$_android_arch/libc++_shared.so \
|
||||
-nostdlib++"
|
||||
|
||||
cd ${_pkgname}_${_boostver}
|
||||
|
||||
./bootstrap.sh --with-toolset=gcc
|
||||
|
||||
install -Dm755 tools/build/src/engine/b2 "${_stagedir}"/bin/b2
|
||||
|
||||
# Support for OpenMPI
|
||||
echo "using mpi ;" >> project-config.jam
|
||||
|
||||
# boostbook is needed by quickbook
|
||||
install -dm755 "${_stagedir}"/share/boostbook
|
||||
cp -a tools/boostbook/{xsl,dtd} "${_stagedir}"/share/boostbook/
|
||||
|
||||
export PATH=$_android_ndk_path/toolchains/llvm/prebuilt/linux-x86_64/bin:$PATH
|
||||
|
||||
# default "minimal" install: "release link=shared,static
|
||||
# runtime-link=shared threading=single,multi"
|
||||
# --layout=tagged will add the "-mt" suffix for multithreaded libraries
|
||||
# and installs includes in $_android_prefix/include/boost.
|
||||
# --layout=system no longer adds the -mt suffix for multi-threaded libs.
|
||||
# install to ${_stagedir} for consistency with regular boost package
|
||||
"${_stagedir}"/bin/b2 \
|
||||
--with-atomic \
|
||||
--with-chrono \
|
||||
--with-container \
|
||||
--with-date_time \
|
||||
--with-exception \
|
||||
--with-fiber \
|
||||
--with-filesystem \
|
||||
--with-graph \
|
||||
--with-graph_parallel \
|
||||
--with-iostreams \
|
||||
--with-locale \
|
||||
--with-log \
|
||||
--with-math \
|
||||
--with-mpi \
|
||||
--with-program_options \
|
||||
--with-random \
|
||||
--with-regex \
|
||||
--with-serialization \
|
||||
--with-system \
|
||||
--with-test \
|
||||
--with-thread \
|
||||
--with-timer \
|
||||
--with-type_erasure \
|
||||
--with-wave \
|
||||
--with-stacktrace \
|
||||
variant=release \
|
||||
debug-symbols=off \
|
||||
threading=multi \
|
||||
runtime-link=shared \
|
||||
link=shared,static \
|
||||
target-os=android \
|
||||
toolset=clang-android \
|
||||
architecture=$_boost_arch \
|
||||
address-model=$_boost_address_model \
|
||||
-sICONV_PATH="/opt/android-libs/$_pkg_arch" \
|
||||
cflags="$common_flags" \
|
||||
cxxflags="$common_flags -fexceptions -frtti -std=c++14" \
|
||||
linkflags="$ld_flags" \
|
||||
--layout=system \
|
||||
${jobs} \
|
||||
\
|
||||
--prefix="${_stagedir}" \
|
||||
install
|
||||
}
|
||||
|
||||
package() {
|
||||
local _stagedir="${srcdir}/stagedir"
|
||||
install -dm755 "${pkgdir}"$_android_prefix
|
||||
cp -a "${_stagedir}"/{include,share} "${pkgdir}"$_android_prefix
|
||||
|
||||
local libdir="${pkgdir}"$_android_prefix/lib
|
||||
install -d "${libdir}"
|
||||
cp -a "${_stagedir}"/lib/*.a "${libdir}"/
|
||||
|
||||
install -dm755 "${pkgdir}"$_android_prefix
|
||||
cp -a "${_stagedir}"/lib "${pkgdir}"$_android_prefix
|
||||
|
||||
install -Dm644 "${srcdir}/"${_pkgname}_${_boostver}/LICENSE_1_0.txt \
|
||||
"${pkgdir}"$_android_prefix/share/licenses/boost/LICENSE_1_0.txt
|
||||
|
||||
local strip=$_android_ndk_path/toolchains/$_android_toolchain-4.9/prebuilt/linux-x86_64/bin/$_android_toolchain-strip
|
||||
find "${libdir}" -iname '*.a' -exec $strip -g {} \;
|
||||
find "${libdir}" -iname '*.so' -exec $strip --strip-unneeded {} \;
|
||||
}
|
||||
|
||||
# vim: ts=2 sw=2 et:
|
||||
|
|
@ -0,0 +1,27 @@
|
|||
--- a/tools/build/src/tools/common.jam 2019-09-18 16:03:02.035995695 +0200
|
||||
+++ b/tools/build/src/tools/common.jam 2019-09-18 16:03:36.386156355 +0200
|
||||
@@ -974,16 +974,16 @@
|
||||
}
|
||||
|
||||
# From GCC 5, versioning changes and minor becomes patch
|
||||
- if $(tag) = gcc && [ numbers.less 4 $(version[1]) ]
|
||||
- {
|
||||
- version = $(version[1]) ;
|
||||
- }
|
||||
+ #if $(tag) = gcc && [ numbers.less 4 $(version[1]) ]
|
||||
+ #{
|
||||
+ # version = $(version[1]) ;
|
||||
+ #}
|
||||
|
||||
# Ditto, from Clang 4
|
||||
- if ( $(tag) = clang || $(tag) = clangw ) && [ numbers.less 3 $(version[1]) ]
|
||||
- {
|
||||
- version = $(version[1]) ;
|
||||
- }
|
||||
+ #if ( $(tag) = clang || $(tag) = clangw ) && [ numbers.less 3 $(version[1]) ]
|
||||
+ #{
|
||||
+ # version = $(version[1]) ;
|
||||
+ #}
|
||||
|
||||
# On intel, version is not added, because it does not matter and it is the
|
||||
# version of vc used as backend that matters. Ideally, we should encode the
|
||||
|
|
@ -0,0 +1,11 @@
|
|||
--- boostcpp.jam.old 2018-08-01 22:50:40.000000000 +0200
|
||||
+++ boostcpp.jam 2018-10-07 01:48:30.175912524 +0200
|
||||
@@ -154,7 +154,7 @@
|
||||
# libFoo.1.2.3.dylib format. AIX linkers do not accept version suffixes
|
||||
# either. Pgi compilers can not accept a library with version suffix.
|
||||
if $(type) = SHARED_LIB &&
|
||||
- ! [ $(property-set).get <target-os> ] in windows cygwin darwin aix &&
|
||||
+ ! [ $(property-set).get <target-os> ] in windows cygwin darwin aix android &&
|
||||
! [ $(property-set).get <toolset> ] in pgi
|
||||
{
|
||||
result = $(result).$(BOOST_VERSION) ;
|
||||
|
|
@ -0,0 +1,156 @@
|
|||
# Maintainer: Martchus <martchus@gmx.net>
|
||||
|
||||
# All my PKGBUILDs are managed at https://github.com/Martchus/PKGBUILDs where
|
||||
# you also find the URL of a binary repository.
|
||||
|
||||
_pkgname=boost
|
||||
_pkg_arch=x86
|
||||
_android_arch=x86
|
||||
_android_toolchain=x86_64-linux-android$_android_platform
|
||||
_android_platform=21 # https://developer.android.com/about/dashboards/
|
||||
_android_prefix=/opt/android-libs/$_pkg_arch
|
||||
_android_ndk_path=/opt/android-ndk
|
||||
_android_platform_arch=arch-x86
|
||||
_android_platform_dir=android-$_android_platform/${_android_platform_arch}
|
||||
_boost_arch=x86
|
||||
_boost_address_model=32
|
||||
|
||||
pkgname=android-$_pkg_arch-$_pkgname
|
||||
pkgver=1.71.0
|
||||
_boostver=${pkgver//./_}
|
||||
pkgrel=1
|
||||
url='https://www.boost.org/'
|
||||
arch=('any')
|
||||
license=('custom')
|
||||
pkgdesc="Free peer-reviewed portable C++ source libraries (Android, $_pkg_arch)"
|
||||
depends=("android-$_pkg_arch-libiconv")
|
||||
options=(!buildflags staticlibs !strip !emptydirs)
|
||||
makedepends=('bzip2' 'zlib' 'android-ndk' 'android-sdk')
|
||||
conflicts=("android-$_pkgname-$_android_arch")
|
||||
replaces=("android-$_pkgname-$_android_arch")
|
||||
source=(https://dl.bintray.com/boostorg/release/${pkgver}/source/boost_${_boostver}.tar.bz2
|
||||
no-versioned-shlibs.patch
|
||||
disable-version-check.patch)
|
||||
sha256sums=('d73a8da01e8bf8c7eda40b4c84915071a8c8a0df4a6734537ddde4a8580524ee'
|
||||
'd82d0f15064812dcabb3456a7bcb1db0e0f6145980e4728e638372e0fd35af23'
|
||||
'13d7ed51d05dba2dfe04d9929bf0091505883567178586d0b482b0900a684848')
|
||||
|
||||
prepare() {
|
||||
cd ${_pkgname}_${_boostver}
|
||||
patch -i ../no-versioned-shlibs.patch
|
||||
patch -p1 -i ../disable-version-check.patch
|
||||
}
|
||||
|
||||
build() {
|
||||
local _stagedir="${srcdir}/stagedir"
|
||||
local jobs="$(sed -e 's/.*\(-j *[0-9]\+\).*/\1/' <<< ${MAKEFLAGS})"
|
||||
local target_flags=" \
|
||||
--target=$_android_toolchain \
|
||||
--gcc-toolchain=$_android_ndk_path/toolchains/$_android_toolchain-4.9/prebuilt/linux-x86_64 \
|
||||
--sysroot=$_android_ndk_path/platforms/$_android_platform_dir/usr"
|
||||
local common_flags=" \
|
||||
$target_flags \
|
||||
-isystem $_android_ndk_path/sources/android/support/include \
|
||||
-isystem $_android_ndk_path/sources/cxx-stl/llvm-libc++/include \
|
||||
-isystem $_android_ndk_path/sources/cxx-stl/llvm-libc++abi/include \
|
||||
-isystem $_android_ndk_path/sysroot/usr/include \
|
||||
-isystem $_android_ndk_path/sysroot/usr/include/$_android_toolchain \
|
||||
-funwind-tables \
|
||||
-no-canonical-prefixes \
|
||||
-D__ANDROID_API__=$_android_platform \
|
||||
-O3 \
|
||||
-fPIC \
|
||||
-DBOOST_ASIO_HAS_STD_STRING_VIEW=1"
|
||||
local ld_flags=" \
|
||||
$target_flags \
|
||||
$_android_ndk_path/sources/cxx-stl/llvm-libc++/libs/$_android_arch/libc++_shared.so \
|
||||
-nostdlib++"
|
||||
|
||||
cd ${_pkgname}_${_boostver}
|
||||
|
||||
./bootstrap.sh --with-toolset=gcc
|
||||
|
||||
install -Dm755 tools/build/src/engine/b2 "${_stagedir}"/bin/b2
|
||||
|
||||
# Support for OpenMPI
|
||||
echo "using mpi ;" >> project-config.jam
|
||||
|
||||
# boostbook is needed by quickbook
|
||||
install -dm755 "${_stagedir}"/share/boostbook
|
||||
cp -a tools/boostbook/{xsl,dtd} "${_stagedir}"/share/boostbook/
|
||||
|
||||
export PATH=$_android_ndk_path/toolchains/llvm/prebuilt/linux-x86_64/bin:$PATH
|
||||
|
||||
# default "minimal" install: "release link=shared,static
|
||||
# runtime-link=shared threading=single,multi"
|
||||
# --layout=tagged will add the "-mt" suffix for multithreaded libraries
|
||||
# and installs includes in $_android_prefix/include/boost.
|
||||
# --layout=system no longer adds the -mt suffix for multi-threaded libs.
|
||||
# install to ${_stagedir} for consistency with regular boost package
|
||||
"${_stagedir}"/bin/b2 \
|
||||
--with-atomic \
|
||||
--with-chrono \
|
||||
--with-container \
|
||||
--with-date_time \
|
||||
--with-exception \
|
||||
--with-fiber \
|
||||
--with-filesystem \
|
||||
--with-graph \
|
||||
--with-graph_parallel \
|
||||
--with-iostreams \
|
||||
--with-locale \
|
||||
--with-log \
|
||||
--with-math \
|
||||
--with-mpi \
|
||||
--with-program_options \
|
||||
--with-random \
|
||||
--with-regex \
|
||||
--with-serialization \
|
||||
--with-system \
|
||||
--with-test \
|
||||
--with-thread \
|
||||
--with-timer \
|
||||
--with-type_erasure \
|
||||
--with-wave \
|
||||
--with-stacktrace \
|
||||
variant=release \
|
||||
debug-symbols=off \
|
||||
threading=multi \
|
||||
runtime-link=shared \
|
||||
link=shared,static \
|
||||
target-os=android \
|
||||
toolset=clang-android \
|
||||
architecture=$_boost_arch \
|
||||
address-model=$_boost_address_model \
|
||||
-sICONV_PATH="/opt/android-libs/$_pkg_arch" \
|
||||
cflags="$common_flags" \
|
||||
cxxflags="$common_flags -fexceptions -frtti -std=c++14" \
|
||||
linkflags="$ld_flags" \
|
||||
--layout=system \
|
||||
${jobs} \
|
||||
\
|
||||
--prefix="${_stagedir}" \
|
||||
install
|
||||
}
|
||||
|
||||
package() {
|
||||
local _stagedir="${srcdir}/stagedir"
|
||||
install -dm755 "${pkgdir}"$_android_prefix
|
||||
cp -a "${_stagedir}"/{include,share} "${pkgdir}"$_android_prefix
|
||||
|
||||
local libdir="${pkgdir}"$_android_prefix/lib
|
||||
install -d "${libdir}"
|
||||
cp -a "${_stagedir}"/lib/*.a "${libdir}"/
|
||||
|
||||
install -dm755 "${pkgdir}"$_android_prefix
|
||||
cp -a "${_stagedir}"/lib "${pkgdir}"$_android_prefix
|
||||
|
||||
install -Dm644 "${srcdir}/"${_pkgname}_${_boostver}/LICENSE_1_0.txt \
|
||||
"${pkgdir}"$_android_prefix/share/licenses/boost/LICENSE_1_0.txt
|
||||
|
||||
local strip=$_android_ndk_path/toolchains/$_android_toolchain-4.9/prebuilt/linux-x86_64/bin/$_android_toolchain-strip
|
||||
find "${libdir}" -iname '*.a' -exec $strip -g {} \;
|
||||
find "${libdir}" -iname '*.so' -exec $strip --strip-unneeded {} \;
|
||||
}
|
||||
|
||||
# vim: ts=2 sw=2 et:
|
||||
|
|
@ -0,0 +1,27 @@
|
|||
--- a/tools/build/src/tools/common.jam 2019-09-18 16:03:02.035995695 +0200
|
||||
+++ b/tools/build/src/tools/common.jam 2019-09-18 16:03:36.386156355 +0200
|
||||
@@ -974,16 +974,16 @@
|
||||
}
|
||||
|
||||
# From GCC 5, versioning changes and minor becomes patch
|
||||
- if $(tag) = gcc && [ numbers.less 4 $(version[1]) ]
|
||||
- {
|
||||
- version = $(version[1]) ;
|
||||
- }
|
||||
+ #if $(tag) = gcc && [ numbers.less 4 $(version[1]) ]
|
||||
+ #{
|
||||
+ # version = $(version[1]) ;
|
||||
+ #}
|
||||
|
||||
# Ditto, from Clang 4
|
||||
- if ( $(tag) = clang || $(tag) = clangw ) && [ numbers.less 3 $(version[1]) ]
|
||||
- {
|
||||
- version = $(version[1]) ;
|
||||
- }
|
||||
+ #if ( $(tag) = clang || $(tag) = clangw ) && [ numbers.less 3 $(version[1]) ]
|
||||
+ #{
|
||||
+ # version = $(version[1]) ;
|
||||
+ #}
|
||||
|
||||
# On intel, version is not added, because it does not matter and it is the
|
||||
# version of vc used as backend that matters. Ideally, we should encode the
|
||||
|
|
@ -0,0 +1,11 @@
|
|||
--- boostcpp.jam.old 2018-08-01 22:50:40.000000000 +0200
|
||||
+++ boostcpp.jam 2018-10-07 01:48:30.175912524 +0200
|
||||
@@ -154,7 +154,7 @@
|
||||
# libFoo.1.2.3.dylib format. AIX linkers do not accept version suffixes
|
||||
# either. Pgi compilers can not accept a library with version suffix.
|
||||
if $(type) = SHARED_LIB &&
|
||||
- ! [ $(property-set).get <target-os> ] in windows cygwin darwin aix &&
|
||||
+ ! [ $(property-set).get <target-os> ] in windows cygwin darwin aix android &&
|
||||
! [ $(property-set).get <toolset> ] in pgi
|
||||
{
|
||||
result = $(result).$(BOOST_VERSION) ;
|
||||
Loading…
Reference in New Issue