summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO9
-rw-r--r--PKGBUILD37
2 files changed, 24 insertions, 22 deletions
diff --git a/.SRCINFO b/.SRCINFO
index b1c1b74e3f6..e14fe53a7d1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = android-x86-boost
pkgdesc = Free peer-reviewed portable C++ source libraries (Android, x86)
- pkgver = 1.74.0
+ pkgver = 1.76.0
pkgrel = 1
url = https://www.boost.org/
arch = any
@@ -16,10 +16,11 @@ pkgbase = android-x86-boost
options = staticlibs
options = !strip
options = !emptydirs
- source = https://dl.bintray.com/boostorg/release/1.74.0/source/boost_1_74_0.tar.bz2
+ source = https://boostorg.jfrog.io/artifactory/main/release/1.76.0/source/boost_1_76_0.tar.gz
+ source = boost-ublas-c++20-iterator.patch::https://github.com/boostorg/ublas/commit/a31e5cffa85f.patch
source = no-versioned-shlibs.patch
- sha256sums = 83bfc1507731a0906e387fc28b7ef5417d591429e51e788417fe9ff025e116b1
+ sha256sums = 7bd7ddceec1a1dfdcbdb3e609b60d01739c38390a5f956385a12f3122049f0ca
+ sha256sums = aa38addb40d5f44b4a8472029b475e7e6aef1c460509eb7d8edf03491dc1b5ee
sha256sums = d82d0f15064812dcabb3456a7bcb1db0e0f6145980e4728e638372e0fd35af23
pkgname = android-x86-boost
-
diff --git a/PKGBUILD b/PKGBUILD
index 32de3539031..87229354fc5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,18 +6,18 @@
_pkgname=boost
_pkg_arch=x86
_android_arch=x86
-_android_toolchain=x86_64-linux-android$_android_platform
+_android_toolchain=i686-linux-android$_android_platform
+_andoird_toolchain_dir=$_android_arch
_android_platform=24 # https://developer.android.com/about/dashboards/
+_android_target=$_android_toolchain
_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.74.0
-_boostver=${pkgver//./_}
+pkgver=1.76.0
+_srcname=boost_${pkgver//./_}
pkgrel=1
url='https://www.boost.org/'
arch=('any')
@@ -28,13 +28,18 @@ 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
+source=(https://boostorg.jfrog.io/artifactory/main/release/$pkgver/source/$_srcname.tar.gz
+ $_pkgname-ublas-c++20-iterator.patch::https://github.com/boostorg/ublas/commit/a31e5cffa85f.patch
no-versioned-shlibs.patch)
-sha256sums=('83bfc1507731a0906e387fc28b7ef5417d591429e51e788417fe9ff025e116b1'
+sha256sums=('7bd7ddceec1a1dfdcbdb3e609b60d01739c38390a5f956385a12f3122049f0ca'
+ 'aa38addb40d5f44b4a8472029b475e7e6aef1c460509eb7d8edf03491dc1b5ee'
'd82d0f15064812dcabb3456a7bcb1db0e0f6145980e4728e638372e0fd35af23')
prepare() {
- cd ${_pkgname}_${_boostver}
+ cd ${_srcname}
+ # https://github.com/boostorg/ublas/pull/97
+ patch -Np2 -i ../$_pkgname-ublas-c++20-iterator.patch
+
patch -i ../no-versioned-shlibs.patch
}
@@ -42,16 +47,12 @@ 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"
+ --target=$_android_target"
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 \
+ -isystem $_android_ndk_path/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/include/c++/v1 \
+ -isystem $_android_ndk_path/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/include \
+ -isystem $_android_ndk_path/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/include/$_android_toolchain \
-fexceptions \
-no-canonical-prefixes \
-D__ANDROID_API__=$_android_platform \
@@ -64,7 +65,7 @@ build() {
$_android_ndk_path/sources/cxx-stl/llvm-libc++/libs/$_android_arch/libc++_shared.so \
-nostdlib++"
- cd ${_pkgname}_${_boostver}
+ cd ${_srcname}
./bootstrap.sh --with-toolset=gcc
@@ -143,7 +144,7 @@ package() {
install -dm755 "${pkgdir}"$_android_prefix
cp -a "${_stagedir}"/lib "${pkgdir}"$_android_prefix
- install -Dm644 "${srcdir}/"${_pkgname}_${_boostver}/LICENSE_1_0.txt \
+ install -Dm644 "${srcdir}/"${_srcname}/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