extra/boost to 1.86.0-1

This commit is contained in:
Kevin Mihelich 2024-09-02 19:25:17 +00:00
parent 2b2cbda8c5
commit 9ab0bb5065
4 changed files with 69 additions and 66 deletions

View file

@ -1,10 +1,10 @@
pkgbase = boost
pkgdesc = Free peer-reviewed portable C++ source libraries
pkgver = 1.83.0
pkgrel = 9
pkgver = 1.86.0
pkgrel = 1
url = https://www.boost.org/
arch = x86_64
license = custom
license = BSL-1.0
makedepends = icu
makedepends = python
makedepends = python-numpy
@ -12,20 +12,14 @@ pkgbase = boost
makedepends = zlib
makedepends = openmpi
makedepends = zstd
source = https://boostorg.jfrog.io/artifactory/main/release/1.83.0/source/boost_1_83_0.tar.bz2
source = boost-1.81.0-phoenix-multiple-definitions.patch
source = boost-support-fn.contains-f-where-f-is-a-function.patch::https://github.com/boostorg/function/commit/7ca2310b15e3.patch
source = https://boostorg.jfrog.io/artifactory/main/release/1.86.0/source/boost_1_86_0.tar.bz2
source = boost-numpy-2.0.patch::https://github.com/boostorg/python/commit/0474de0f6cc9.patch
source = boost-ublas-c++20-iterator.patch::https://github.com/boostorg/ublas/commit/a31e5cffa85f.patch
sha256sums = 6478edfe2f3305127cffe8caf73ea0176c53769f4bf1585be237eb30798c3b8e
sha256sums = 3ebf428ef6be090a7b56a233330375539ac429333b83708e28fe5db049cfecdb
sha256sums = 1b5998ee8fb389dd6df55a3684d29ffa37246bc007e8e6712bf2be6c7f745036
sha256sums = 1bed88e40401b2cb7a1f76d4bab499e352fa4d0c5f31c0dbae64e24d34d7513b
sha256sums = ccda8ef8126c93f4c8d29ba43b5f301952e5eacdc7fecb2ae3d01115a2222c53
sha256sums = aa38addb40d5f44b4a8472029b475e7e6aef1c460509eb7d8edf03491dc1b5ee
pkgname = boost
pkgdesc = Free peer-reviewed portable C++ source libraries (development headers)
depends = boost-libs=1.83.0
depends = boost-libs=1.86.0
optdepends = python: for python bindings
options = staticlibs
@ -37,6 +31,7 @@ pkgname = boost-libs
depends = zstd
optdepends = openmpi: for mpi support
provides = libboost_atomic.so
provides = libboost_charconv.so
provides = libboost_chrono.so
provides = libboost_container.so
provides = libboost_context.so
@ -63,6 +58,7 @@ pkgname = boost-libs
provides = libboost_nowide.so
provides = libboost_numpy.so
provides = libboost_prg_exec_monitor.so
provides = libboost_process.so
provides = libboost_program_options.so
provides = libboost_python.so
provides = libboost_random.so
@ -70,6 +66,7 @@ pkgname = boost-libs
provides = libboost_serialization.so
provides = libboost_stacktrace_addr2line.so
provides = libboost_stacktrace_basic.so
provides = libboost_stacktrace_from_exception.so
provides = libboost_stacktrace_noop.so
provides = libboost_system.so
provides = libboost_thread.so

View file

@ -0,0 +1,5 @@
[boost]
source = "git"
git = "https://github.com/boostorg/boost.git"
prefix = "boost-"
exclude_regex = ".*beta.*"

View file

@ -1,4 +1,5 @@
# Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
# Maintainer: Evangelos Foutras <foutrelis@archlinux.org>
# Maintainer: Christian Heusel <gromit@archlinux.org>
# Contributor: Levente Polyak <anthraxx[at]archlinux[dot]org>
# Contributor: Bartłomiej Piotrowski <bpiotrowski@archlinux.org>
# Contributor: Marius Knaust <marius.knaust@gmail.com>
@ -13,41 +14,24 @@
# - specify arm architecture to b2 for aarch64
pkgname=('boost' 'boost-libs')
pkgver=1.83.0
pkgrel=9
pkgver=1.86.0
pkgrel=1
_srcname=boost_${pkgver//./_}
pkgdesc="Free peer-reviewed portable C++ source libraries"
arch=('x86_64')
url="https://www.boost.org/"
license=('custom')
license=('BSL-1.0')
makedepends=('icu' 'python' 'python-numpy' 'bzip2' 'zlib' 'openmpi' 'zstd')
source=(https://boostorg.jfrog.io/artifactory/main/release/$pkgver/source/$_srcname.tar.bz2
boost-1.81.0-phoenix-multiple-definitions.patch
$pkgname-support-fn.contains-f-where-f-is-a-function.patch::https://github.com/boostorg/function/commit/7ca2310b15e3.patch
$pkgname-numpy-2.0.patch::https://github.com/boostorg/python/commit/0474de0f6cc9.patch
$pkgname-ublas-c++20-iterator.patch::https://github.com/boostorg/ublas/commit/a31e5cffa85f.patch)
sha256sums=('6478edfe2f3305127cffe8caf73ea0176c53769f4bf1585be237eb30798c3b8e'
'3ebf428ef6be090a7b56a233330375539ac429333b83708e28fe5db049cfecdb'
'1b5998ee8fb389dd6df55a3684d29ffa37246bc007e8e6712bf2be6c7f745036'
'ccda8ef8126c93f4c8d29ba43b5f301952e5eacdc7fecb2ae3d01115a2222c53'
'aa38addb40d5f44b4a8472029b475e7e6aef1c460509eb7d8edf03491dc1b5ee')
$pkgname-numpy-2.0.patch::https://github.com/boostorg/python/commit/0474de0f6cc9.patch)
sha256sums=('1bed88e40401b2cb7a1f76d4bab499e352fa4d0c5f31c0dbae64e24d34d7513b'
'ccda8ef8126c93f4c8d29ba43b5f301952e5eacdc7fecb2ae3d01115a2222c53')
prepare() {
cd $_srcname
# https://github.com/boostorg/phoenix/issues/111
patch -Np1 -i ../boost-1.81.0-phoenix-multiple-definitions.patch
# https://github.com/boostorg/signals2/issues/68
# https://github.com/boostorg/function/issues/46
patch -Np2 -i <(sed 's#test/#asd/libs/function/test/#' \
../$pkgname-support-fn.contains-f-where-f-is-a-function.patch)
# support building against NumPy 2.0
patch -Np1 -d libs/python <../$pkgname-numpy-2.0.patch
# https://github.com/boostorg/ublas/pull/97
patch -Np2 -i ../$pkgname-ublas-c++20-iterator.patch
}
build() {
@ -108,8 +92,6 @@ package_boost() {
for _lib in python numpy; do
ln -srL "$pkgdir"/usr/lib/libboost_${_lib}{${python_version/.},${python_version%.*}}.so
done
install -Dm644 -t "$pkgdir/usr/share/licenses/$pkgname" $_srcname/LICENSE_1_0.txt
}
package_boost-libs() {
@ -119,21 +101,53 @@ package_boost-libs() {
pkgdesc+=' (runtime libraries)'
depends=('bzip2' 'zlib' 'icu' 'zstd')
optdepends=('openmpi: for mpi support')
provides=(libboost_atomic.so libboost_chrono.so libboost_container.so
libboost_context.so libboost_contract.so libboost_coroutine.so
libboost_date_time.so libboost_fiber.so libboost_filesystem.so
libboost_graph.so libboost_graph_parallel.so libboost_iostreams.so
libboost_json.so libboost_locale.so libboost_log.so libboost_log_setup.so
libboost_math_c99.so libboost_math_c99f.so libboost_math_c99l.so
libboost_math_tr1.so libboost_math_tr1f.so libboost_math_tr1l.so
libboost_mpi{,_python${python_version/.}}.so libboost_nowide.so
libboost_numpy${python_version/.}.so libboost_prg_exec_monitor.so
libboost_program_options.so libboost_python${python_version/.}.so
libboost_random.so libboost_regex.so libboost_serialization.so
libboost_stacktrace_addr2line.so libboost_stacktrace_basic.so
libboost_stacktrace_noop.so libboost_system.so libboost_thread.so
libboost_timer.so libboost_type_erasure.so libboost_unit_test_framework.so
libboost_url.so libboost_wave.so libboost_wserialization.so)
provides=(
libboost_atomic.so
libboost_charconv.so
libboost_chrono.so
libboost_container.so
libboost_context.so
libboost_contract.so
libboost_coroutine.so
libboost_date_time.so
libboost_fiber.so
libboost_filesystem.so
libboost_graph.so
libboost_graph_parallel.so
libboost_iostreams.so
libboost_json.so
libboost_locale.so
libboost_log.so
libboost_log_setup.so
libboost_math_c99.so
libboost_math_c99f.so
libboost_math_c99l.so
libboost_math_tr1.so
libboost_math_tr1f.so
libboost_math_tr1l.so
libboost_mpi{,_python${python_version/.}}.so
libboost_nowide.so
libboost_numpy${python_version/.}.so
libboost_prg_exec_monitor.so
libboost_process.so
libboost_program_options.so
libboost_python${python_version/.}.so
libboost_random.so
libboost_regex.so
libboost_serialization.so
libboost_stacktrace_addr2line.so
libboost_stacktrace_basic.so
libboost_stacktrace_from_exception.so
libboost_stacktrace_noop.so
libboost_system.so
libboost_thread.so
libboost_timer.so
libboost_type_erasure.so
libboost_unit_test_framework.so
libboost_url.so
libboost_wave.so
libboost_wserialization.so
)
install -dm755 "$pkgdir"/usr/lib
cp -a fakeinstall/lib/*.so.* "$pkgdir"/usr/lib/
@ -144,8 +158,6 @@ package_boost-libs() {
touch "$pkgdir"$site_packages/boost/__init__.py
python -m compileall -o 0 -o 1 -o 2 "$pkgdir"$site_packages/boost
cp fakeinstall/lib/boost-python*/mpi.so "$pkgdir"$site_packages/boost/mpi.so
install -Dm644 -t "$pkgdir/usr/share/licenses/$pkgname" $_srcname/LICENSE_1_0.txt
}
# vim:set ts=2 sw=2 et:

View file

@ -1,11 +0,0 @@
https://bugs.gentoo.org/887041
https://github.com/boostorg/phoenix/issues/111
--- a/boost/phoenix/stl.hpp
+++ b/boost/phoenix/stl.hpp
@@ -11,6 +11,5 @@
#include <boost/phoenix/stl/algorithm.hpp>
#include <boost/phoenix/stl/container.hpp>
-#include <boost/phoenix/stl/tuple.hpp>
#endif