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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 8EBA5158086 for ; Sat, 20 Nov 2021 07:07:39 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B6FD1E07F9; Sat, 20 Nov 2021 07:07:38 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 1580EE07F9 for ; Sat, 20 Nov 2021 07:07:38 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2B308342BE6 for ; Sat, 20 Nov 2021 07:07:37 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B151F1C0 for ; Sat, 20 Nov 2021 07:07:35 +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: <1637392045.6d3c1357a7c95b95ecdbf31b3c919890efbcd7f0.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/boost/files/, dev-libs/boost/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/boost/boost-1.77.0-r2.ebuild dev-libs/boost/boost-1.77.0-r3.ebuild dev-libs/boost/files/boost-1.77.0-python-3.10.patch X-VCS-Directories: dev-libs/boost/ dev-libs/boost/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 6d3c1357a7c95b95ecdbf31b3c919890efbcd7f0 X-VCS-Branch: master Date: Sat, 20 Nov 2021 07:07:35 +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: 79c771e0-b0a2-4890-b44a-6c7787aba730 X-Archives-Hash: 4bc472a8e97dc0f7e37e3e3d5224e566 commit: 6d3c1357a7c95b95ecdbf31b3c919890efbcd7f0 Author: Sam James gentoo org> AuthorDate: Sat Nov 20 07:06:09 2021 +0000 Commit: Sam James gentoo org> CommitDate: Sat Nov 20 07:07:25 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d3c1357 dev-libs/boost: add Python 3.10 patch Been meaning to add this but was undecided given no problems seemed to pop up. Then made the connection (doh) between the linked OpenVDB bug after seeing another distro (Exherbo) pick up this patch. Let's see if it helps the situation there. Bug: https://bugs.gentoo.org/790350 Signed-off-by: Sam James gentoo.org> ...ost-1.77.0-r2.ebuild => boost-1.77.0-r3.ebuild} | 1 + .../boost/files/boost-1.77.0-python-3.10.patch | 44 ++++++++++++++++++++++ 2 files changed, 45 insertions(+) diff --git a/dev-libs/boost/boost-1.77.0-r2.ebuild b/dev-libs/boost/boost-1.77.0-r3.ebuild similarity index 99% rename from dev-libs/boost/boost-1.77.0-r2.ebuild rename to dev-libs/boost/boost-1.77.0-r3.ebuild index 05e615af56f6..f0f451a1432a 100644 --- a/dev-libs/boost/boost-1.77.0-r2.ebuild +++ b/dev-libs/boost/boost-1.77.0-r3.ebuild @@ -56,6 +56,7 @@ PATCHES=( "${WORKDIR}"/${PN}-1.76-sparc-define.patch "${WORKDIR}"/${PN}-1.77-math-deprecated-include.patch "${WORKDIR}"/${PN}-1.77-geometry.patch + "${FILESDIR}"/${P}-python-3.10.patch ) python_bindings_needed() { diff --git a/dev-libs/boost/files/boost-1.77.0-python-3.10.patch b/dev-libs/boost/files/boost-1.77.0-python-3.10.patch new file mode 100644 index 000000000000..69181b1fa42b --- /dev/null +++ b/dev-libs/boost/files/boost-1.77.0-python-3.10.patch @@ -0,0 +1,44 @@ +https://github.com/boostorg/boost_install/commit/0605dadfacf51994dcd8c5c82fb733dc6fa24073 + +From: Martin Jansa +Date: Tue, 19 Oct 2021 12:24:31 +0000 +Subject: [PATCH] BoostConfig.cmake: allow searching for python310 + +* accept double digits in Python3_VERSION_MINOR + +* if someone is using e.g.: + find_package(Python3 REQUIRED) + find_package(Boost REQUIRED python${Python3_VERSION_MAJOR}${Python3_VERSION_MINOR}) + + with python-3.10 then it currently fails with: + + -- Found PythonLibs: /usr/lib/libpython3.10.so (found version "3.10.0") + -- Found Python3: -native/usr/bin/python3-native/python3 (found version "3.10.0") found components: Interpreter + CMake Error at /usr/lib/cmake/Boost-1.77.0/BoostConfig.cmake:141 (find_package): + Could not find a package configuration file provided by "boost_python310" + (requested version 1.77.0) with any of the following names: + + boost_python310Config.cmake + boost_python310-config.cmake + + Add the installation prefix of "boost_python310" to CMAKE_PREFIX_PATH or + set "boost_python310_DIR" to a directory containing one of the above files. + If "boost_python310" provides a separate development package or SDK, be + sure it has been installed. + Call Stack (most recent call first): + /usr/lib/cmake/Boost-1.77.0/BoostConfig.cmake:258 (boost_find_component) + /usr/share/cmake-3.21/Modules/FindBoost.cmake:594 (find_package) + CMakeLists.txt:18 (find_package) + +Signed-off-by: Martin Jansa +--- a/tools/boost_install/BoostConfig.cmake ++++ b/tools/boost_install/BoostConfig.cmake +@@ -113,7 +113,7 @@ macro(boost_find_component comp required quiet) + set(_BOOST_REQUIRED REQUIRED) + endif() + +- if("${comp}" MATCHES "^(python|numpy|mpi_python)([1-9])([0-9])$") ++ if("${comp}" MATCHES "^(python|numpy|mpi_python)([1-9])([0-9][0-9]?)$") + + # handle pythonXY and numpyXY versioned components for compatibility +