main/boost: upgrade to 1.71.0

2 files changed, 13 insertions, 42 deletions

diff --git a/main/boost/APKBUILD b/main/boost/APKBUILD
index 41ea0d6ff9..bdf5be214e 100644
--- a/main/boost/APKBUILD
+++ b/main/boost/APKBUILD
@@ -1,8 +1,8 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=boost
-pkgver=1.69.0
+pkgver=1.71.0
 _pkgver="${pkgver//./_}"
-pkgrel=5
+pkgrel=0
 pkgdesc="Free peer-reviewed portable C++ source libraries"
 url="http://www.boost.org/"
 arch="all"
@@ -11,26 +11,15 @@ depends="$pkgname-libs"
 depends_dev="$pkgname linux-headers"
 makedepends="$depends_dev python2-dev>=2.6 python3-dev flex bison bzip2-dev icu-dev xz-dev zlib-dev"
 subpackages="$pkgname-static $pkgname-dev $pkgname-doc"
-source="https://dl.bintray.com/boostorg/release/$pkgver/source/${pkgname}_$_pkgver.tar.bz2
+source="https://dl.bintray.com/boostorg/release/$pkgver/source/boost_$_pkgver.tar.bz2
 	boost-1.57.0-python-abi_letters.patch
 	boost-1.57.0-python-libpython_dep.patch
-	revert-wifsignaled-static-assert.patch
 	"
 options="!checkroot"
-builddir="$srcdir/${pkgname}_${_pkgver}"
-
-case "$CARCH" in
-	arm*|aarch64) _boostarch=arm ;;
-	mips*) _boostarch=mips ;;
-	ppc64*) _boostarch=ppc ;;
-	s390x)
-		_boostarch=s390
-		_l_suffix=390
-		;;
-	*) _boostarch=$CARCH ;;
-esac
+builddir="$srcdir/${pkgname}_$_pkgver"
+
 _enginedir="tools/build/src/engine"
-_bjam="${builddir}/${_enginedir}/bin.linux${_l_suffix:-$_boostarch}/b2"
+_bjam="$builddir"/$_enginedir/b2
 
 _libs="
 	atomic
@@ -66,7 +55,7 @@ _libs="
 	wserialization
 	"
 for _lib in $_libs; do
-	subpackages="$subpackages ${pkgname}-${_lib}:_boostlib"
+	subpackages="$subpackages $pkgname-${_lib}:_boostlib"
 done; unset -v _lib
 subpackages="$subpackages $pkgname-libs"
 
@@ -74,7 +63,7 @@ _set_options() {
 	[ -n "$PY2_VERSION" ] || PY2_VERSION="$(_pyversion python2)"
 	[ -n "$PY3_VERSION" ] || PY3_VERSION="$(_pyversion python3)"
 
-	local _options_python="${PY2_VERSION:+$PY2_VERSION,}${PY3_VERSION}"
+	local _options_python="${PY2_VERSION:+$PY2_VERSION,}$PY3_VERSION"
 	[ -z "$_options_python" ] || _options_python="python=$_options_python"
 
 	_options="
@@ -98,14 +87,13 @@ _set_options() {
 prepare() {
 	default_prepare
 
-	cd "$builddir"
 	_set_options
 	local abiflags="$(python3-config --abiflags)"
 
 	# create user-config.jam
 	cat > user-config.jam <<-__EOF__
 
-	using gcc : : $CC : <cxxflags>"${CXXFLAGS}" <linkflags>"${LDFLAGS}" ;
+	using gcc : : $CC : <cxxflags>"$CXXFLAGS" <linkflags>"$LDFLAGS" ;
 	using python : ${PY2_VERSION:+$PY2_VERSION }: /usr/bin/python2 : ${PY2_VERSION:+/usr/include/python${PY2_VERSION} }: : : : ;
 	using python : ${PY3_VERSION:+$PY3_VERSION }: /usr/bin/python3 : ${PY3_VERSION:+/usr/include/python${PY3_VERSION}${abiflags} }: : : : ${abiflags:+$abiflags };
 
@@ -117,7 +105,7 @@ build() {
 
 	msg "Building bjam"
 	cd "$builddir"/$_enginedir
-	CC= ./build.sh cc
+	CC= ./build.sh gcc
 
 	msg "Building bcp"
 	cd "$builddir"/tools/bcp
@@ -132,12 +120,11 @@ build() {
 check() {
 	cd "$builddir"/tools/build/test
 
-	PATH="${_bjam%/*}:${PATH}" python2 test_all.py --default-bjam
+	PATH="${_bjam%/*}:$PATH" python2 test_all.py --default-bjam
 }
 
 package() {
 	export BOOST_ROOT="$builddir"
-	cd "$builddir"
 	_set_options
 
 	install -Dm755 "$_bjam" \
@@ -191,7 +178,6 @@ _pyversion() {
 	"$1" -c 'import sys; print("%i.%i" % (sys.version_info.major, sys.version_info.minor))'
 }
 
-sha512sums="d0e9bb858c44880d56c0291afef6a1b011a62f659a2d8f58dcb6147ea0899f9157bd8db3097896618fee0116847ebeac78b6d0f0fec8a92c3469500828bbe552  boost_1_69_0.tar.bz2
+sha512sums="b7937d50c4512cf13cadd0ca829de36cf2cbc6fb788f45b1d4565ad0753e2b206c545125a5862016c2f16016f2e4a6b687928963b466fff17c3e0a4437142c20  boost_1_71_0.tar.bz2
 d96d4d37394a31764ed817d0bc4a99cffa68a75ff1ecfd4417b9e1e5ae2c31a96ed24f948c6f2758ffdac01328d2402c4cf0d33a37107e4f5f721e636daebd66  boost-1.57.0-python-abi_letters.patch
-132c4b62815d605c2d3c9038427fa4f422612a33711d47b2862f2311516af8a371d6b75bf078a7bffe20be863f8d21fb9fe74dc1a1bac3a10d061e9768ec3e02  boost-1.57.0-python-libpython_dep.patch
-1cae6ab9b3b97e0328aa5b85ee2220bb1e88b99256b31bc4a2d06275cf70704c8f4f1bd6abd77386d0490bb14a0393ae981be8e95f2cc054a1dc07de8847e8d5  revert-wifsignaled-static-assert.patch"
+132c4b62815d605c2d3c9038427fa4f422612a33711d47b2862f2311516af8a371d6b75bf078a7bffe20be863f8d21fb9fe74dc1a1bac3a10d061e9768ec3e02  boost-1.57.0-python-libpython_dep.patch"
diff --git a/main/boost/revert-wifsignaled-static-assert.patch b/main/boost/revert-wifsignaled-static-assert.patch
deleted file mode 100644
index cba4ec8aca..0000000000
--- a/main/boost/revert-wifsignaled-static-assert.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-http://www.openwall.com/lists/musl/2018/08/10/3
-
-diff --git a/boost/process/detail/posix/is_running.hpp b/boost/process/detail/posix/is_running.hpp
-index 0d431a9..342be7d 100644
---- a/boost/process/detail/posix/is_running.hpp
-+++ b/boost/process/detail/posix/is_running.hpp
-@@ -17,7 +17,7 @@ namespace boost { namespace process { namespace detail { namespace posix {
- // This bit arrangement of status codes is not guaranteed by POSIX, but (according to comments in
- // the glibc <bits/waitstatus.h> header) is the same across systems in practice.
- constexpr int still_active = 0x7F;
--static_assert(!WIFEXITED(still_active) && !WIFSIGNALED(still_active), "Internal Error");
-+static_assert(!WIFEXITED(still_active), "Internal Error");
- 
- inline bool is_running(int code)
- {