From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 215D81382C5 for ; Mon, 24 May 2021 21:38:54 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EE7D5E0798; Mon, 24 May 2021 21:38:50 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D65C0E0798 for ; Mon, 24 May 2021 21:38:50 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id AA05F340871 for ; Mon, 24 May 2021 21:38:49 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2CB9C720 for ; Mon, 24 May 2021 21:38:48 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1621892318.59d42a91c016480f85370bd84093a33f5c3cde2f.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/boost/, dev-libs/boost/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/boost/boost-1.76.0-r1.ebuild dev-libs/boost/files/boost-1.76-boost-numpy.patch X-VCS-Directories: dev-libs/boost/files/ dev-libs/boost/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 59d42a91c016480f85370bd84093a33f5c3cde2f X-VCS-Branch: master Date: Mon, 24 May 2021 21:38:48 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: ff129236-c178-4282-9e03-de16d8588d5f X-Archives-Hash: ae3ee2f0cccb55826bf25f072b56277d commit: 59d42a91c016480f85370bd84093a33f5c3cde2f Author: David Seifert gentoo org> AuthorDate: Mon May 24 19:55:23 2021 +0000 Commit: Sam James gentoo org> CommitDate: Mon May 24 21:38:38 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=59d42a91 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 gentoo.org> Closes: https://github.com/gentoo/gentoo/pull/20971 Signed-off-by: Sam James gentoo.org> dev-libs/boost/boost-1.76.0-r1.ebuild | 3 ++- dev-libs/boost/files/boost-1.76-boost-numpy.patch | 23 +++++++++++++++++++++++ 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/dev-libs/boost/boost-1.76.0-r1.ebuild b/dev-libs/boost/boost-1.76.0-r1.ebuild index d760d92ea5a..16bc039e226 100644 --- a/dev-libs/boost/boost-1.76.0-r1.ebuild +++ b/dev-libs/boost/boost-1.76.0-r1.ebuild @@ -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() { diff --git a/dev-libs/boost/files/boost-1.76-boost-numpy.patch b/dev-libs/boost/files/boost-1.76-boost-numpy.patch new file mode 100644 index 00000000000..d9af132039e --- /dev/null +++ b/dev-libs/boost/files/boost-1.76-boost-numpy.patch @@ -0,0 +1,23 @@ +From 0796305c863804a2b31610507c531da5c0408422 Mon Sep 17 00:00:00 2001 +From: Peter Dimov +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 + BOOST_NUMPY_SOURCE + [ cond [ python.numpy ] : /python//python_for_extensions ] + [ unless [ python.numpy ] : no ] +- $(numpy-include) ++ /python//numpy + boost_python + on:BOOST_DEBUG_PYTHON + -@$(BOOST_JAMROOT_MODULE)%$(BOOST_JAMROOT_MODULE).tag