[arch-commits] Commit in boost/trunk (PKGBUILD)

[Evangelos Foutras]

    Date: Wednesday, December 9, 2020 @ 20:00:25
  Author: foutrelis
Revision: 403215

upgpkg: boost 1.74.0-2: apply ublas fixes for c++20 support (FS#68909)

Modified:
  boost/trunk/PKGBUILD

----------+
 PKGBUILD |   29 +++++++++++++++++++++++++----
 1 file changed, 25 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-12-09 19:34:20 UTC (rev 403214)
+++ PKGBUILD	2020-12-09 20:00:25 UTC (rev 403215)
@@ -12,16 +12,37 @@
 pkgname=('boost-libs' 'boost')
 pkgver=1.74.0
 _boostver=${pkgver//./_}
-pkgrel=1
+pkgrel=2
 pkgdesc='Free peer-reviewed portable C++ source libraries'
 url='https://www.boost.org/'
 arch=('x86_64')
 license=('custom')
 makedepends=('icu' 'python' 'python-numpy' 'bzip2' 'zlib' 'openmpi' 'zstd' 'findutils')
-source=(https://dl.bintray.com/boostorg/release/${pkgver}/source/boost_${_boostver}.tar.bz2)
-sha256sums=('83bfc1507731a0906e387fc28b7ef5417d591429e51e788417fe9ff025e116b1')
-b2sums=('2982f64fccf6fdb3b4b74452e603f459242d7abb42df4162278d9b558b637786a2eb97442126967b19088d591777c64ced8f60a23e71eaa0b7545e80f800de63')
+source=(https://dl.bintray.com/boostorg/release/${pkgver}/source/boost_${_boostver}.tar.bz2
+        ${pkgbase}-ublas-c++20-allocator-patch1.patch::https://github.com/boostorg/ublas/commit/47a314dd01d1.patch
+        ${pkgbase}-ublas-c++20-allocator-patch2.patch::https://github.com/boostorg/ublas/commit/a23a903f9a36.patch
+        ${pkgbase}-ublas-c++20-iterator.patch::https://github.com/boostorg/ublas/commit/a31e5cffa85f.patch)
+sha256sums=('83bfc1507731a0906e387fc28b7ef5417d591429e51e788417fe9ff025e116b1'
+            '3f42688a87c532ac916889f21a4487b9e94a38a047b18724385eaa474719a9f7'
+            '67f413463a1a12bdf63c913acd318148dda618d3f994e466232e265bbf0c2903'
+            'aa38addb40d5f44b4a8472029b475e7e6aef1c460509eb7d8edf03491dc1b5ee')
+b2sums=('2982f64fccf6fdb3b4b74452e603f459242d7abb42df4162278d9b558b637786a2eb97442126967b19088d591777c64ced8f60a23e71eaa0b7545e80f800de63'
+        '2375711ebfa084fbf91171c326c3219daa2038c803338340528ff873932c2cf3a49531ed72af1be9fc7af0440e311772ee1f4c44669eb551a81476b1d65f6ca0'
+        'cef20c446636a2d68746537bdbe8d2821ae9d7f56c26dc1ef5d60ce7815c133debd616617f0f5db708d5365511f176e32f863f14bf69bc5a25e72def0a6cf147'
+        'e5f6d4884eaa557d5547e7e079c2edb4ed9f2f4cd8579aa32a2150f824a5d04413f2a91e79b3139d5b915da6a46f7835f1438ad53f33096973f1a99f378ec1d3')
 
+prepare() {
+   cd ${pkgbase}_${_boostver}
+
+   # https://github.com/boostorg/ublas/issues/96
+   patch -Np2 -i ../${pkgbase}-ublas-c++20-allocator-patch1.patch
+   patch -Np2 -i <(<../${pkgbase}-ublas-c++20-allocator-patch2.patch \
+     sed 's:test/:pls-apply-cleanly-kthxbai/libs/numeric/ublas/&:g')
+
+   # https://github.com/boostorg/ublas/pull/97
+   patch -Np2 -i ../${pkgbase}-ublas-c++20-iterator.patch
+}
+
 build() {
    export _stagedir="${srcdir}/stagedir"
    local JOBS="$(sed -e 's/.*\(-j *[0-9]\+\).*/\1/' <<< ${MAKEFLAGS})"