dev-libs/boost: Fix for numpy include

Closes: https://bugs.gentoo.org/733830
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: David Seifert <soap@gentoo.org>
Closes: https://github.com/gentoo/gentoo/pull/20971
Signed-off-by: Sam James <sam@gentoo.org>
This commit is contained in:
David Seifert
2021-05-24 21:55:23 +02:00
committed by Sam James
parent 2cd8437b2d
commit 59d42a91c0
2 changed files with 25 additions and 1 deletions

View File

@@ -45,7 +45,7 @@ RDEPEND="
zlib? ( sys-libs/zlib:=[${MULTILIB_USEDEP}] )
zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )"
DEPEND="${RDEPEND}"
BDEPEND=">=dev-util/boost-build-${MAJOR_V}-r1"
BDEPEND=">=dev-util/boost-build-${MAJOR_V}-r2"
PATCHES=(
"${FILESDIR}"/${PN}-1.71.0-disable_icu_rpath.patch
@@ -54,6 +54,7 @@ PATCHES=(
# Boost.MPI's __init__.py doesn't work on Py3
"${FILESDIR}"/${PN}-1.73-boost-mpi-python-PEP-328.patch
"${FILESDIR}"/${PN}-1.74-CVE-2012-2677.patch
"${FILESDIR}"/${PN}-1.76-boost-numpy.patch
)
python_bindings_needed() {

View File

@@ -0,0 +1,23 @@
From 0796305c863804a2b31610507c531da5c0408422 Mon Sep 17 00:00:00 2001
From: Peter Dimov <pdimov@gmail.com>
Date: Mon, 24 May 2021 22:14:55 +0300
Subject: [PATCH] Use the /python//numpy target instead of [ numpy.include ]
(fixes #361)
---
libs/python/build/Jamfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libs/python/build/Jamfile b/libs/python/build/Jamfile
index dbc9fb203..03b69a25d 100644
--- a/libs/python/build/Jamfile
+++ b/libs/python/build/Jamfile
@@ -117,7 +117,7 @@ lib boost_numpy
<define>BOOST_NUMPY_SOURCE
[ cond [ python.numpy ] : <library>/python//python_for_extensions ]
[ unless [ python.numpy ] : <build>no ]
- <include>$(numpy-include)
+ <library>/python//numpy
<library>boost_python
<python-debugging>on:<define>BOOST_DEBUG_PYTHON
-<tag>@$(BOOST_JAMROOT_MODULE)%$(BOOST_JAMROOT_MODULE).tag