Date: Saturday, January 21, 2023 @ 14:30:34
Author: foutrelis
Revision: 1387325
upgpkg: lib32-boost 1.81.0-2: fix phoenix multiple defs
Added:
lib32-boost/trunk/boost-1.81.0-phoenix-multiple-definitions.patch
Modified:
lib32-boost/trunk/PKGBUILD
-------------------------------------------------+
PKGBUILD | 7 ++++++-
boost-1.81.0-phoenix-multiple-definitions.patch | 11 +++++++++++
2 files changed, 17 insertions(+), 1 deletion(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2023-01-21 14:16:43 UTC (rev 1387324)
+++ PKGBUILD 2023-01-21 14:30:34 UTC (rev 1387325)
@@ -5,7 +5,7 @@
pkgname=(lib32-boost lib32-boost-libs)
pkgver=1.81.0
_srcname=${_name}_${pkgver//./_}
-pkgrel=1
+pkgrel=2
pkgdesc="Free peer-reviewed portable C++ source libraries - 32bit"
arch=(x86_64)
url="https://www.boost.org/";
@@ -16,13 +16,16 @@
source=(
"https://boostorg.jfrog.io/artifactory/main/release/$pkgver/source/$_srcname.tar.bz2";
"${_name}-1.78.0-no_cmake_native.patch"
+ "${_name}-1.81.0-phoenix-multiple-definitions.patch"
"${_name}-ublas-c++20-iterator.patch::https://github.com/boostorg/ublas/commit/a31e5cffa85f.patch";
)
sha512sums=('a04201e73da59f68fa02761b333c864a96ebaf268247b6b10cb19ed3d70ee9ad3da4c53123f2a7a4a9b9e1408793b51e1adbcc6fd09f60fecef3ca9522bb6b36'
'364387300b9846337d3b8a87ecf677943ab37f7784c74616aaeb1c5ce688b12b6f51516b17c321375eb3ab0319fc206ae8be4a457ec145d69b15d0b8ad62d198'
+
'6e4f012158ac8ee81a783ab0a937bc127dbed4ae96882128ef802ca866cfea98018a4287a139e06d8918004b9e8fc3a31181da14b4c2dd1bf19c8f64cecb049a'
'1b9b2d8a4a1c290d30fb9fb340ea6b222a37424ddd461e0f2c869fba424b41fb8ebc612303fb6427a31939c8813e14fe086e188ea2168f3f9c43d43beea4ffa5')
b2sums=('ae57247fb80ee5a952881a99bdbe9a1d5622690879ef59053716647dc1121e70fdd322251837387b43357f1cd63c6d1ba285cf35c0c40e4f5ee28a929d7eacf7'
'468d07f48cfa4a1b39724baf66b96cfc4b580eff5231704c5977919e8683c69aeda8759c39b898b8f2e554342bb855912efbe05dd21fc04b898921847056dcf4'
+
'd9bae6f053188f936ef45b521ff0fd3ed91cbb9fb90d74d94ac55844213de82f0c8b075796e19cf9e14d840add3154c66e9ccb2b5dcd88e71fee7505d547c4c8'
'e5f6d4884eaa557d5547e7e079c2edb4ed9f2f4cd8579aa32a2150f824a5d04413f2a91e79b3139d5b915da6a46f7835f1438ad53f33096973f1a99f378ec1d3')
_pick() {
@@ -43,6 +46,8 @@
patch -Np2 -i ../${_name}-ublas-c++20-iterator.patch
# remove unneeded cmake checks, that would relate to the build dir
patch -Np1 -i ../"${_name}-1.78.0-no_cmake_native.patch"
+ # https://github.com/boostorg/phoenix/issues/111
+ patch -Np1 -i ../boost-1.81.0-phoenix-multiple-definitions.patch
mkdir -vp "${_tmp_install_dir}"
}
Added: boost-1.81.0-phoenix-multiple-definitions.patch
===================================================================
--- boost-1.81.0-phoenix-multiple-definitions.patch
(rev 0)
+++ boost-1.81.0-phoenix-multiple-definitions.patch 2023-01-21 14:30:34 UTC
(rev 1387325)
@@ -0,0 +1,11 @@
+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
