From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1345102-garchives=archives.gentoo.org@lists.gentoo.org>
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 48389158086
for <garchives@archives.gentoo.org>; Thu, 2 Dec 2021 02:34:50 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 22D85E081B;
Thu, 2 Dec 2021 02:34:49 +0000 (UTC)
Received: from smtp.gentoo.org (dev.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) server-digest SHA256)
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id B4EA0E081B
for <gentoo-commits@lists.gentoo.org>; Thu, 2 Dec 2021 02:34:47 +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) server-digest SHA256)
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id DB53C343173
for <gentoo-commits@lists.gentoo.org>; Thu, 2 Dec 2021 02:34:43 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 296DE8E
for <gentoo-commits@lists.gentoo.org>; Thu, 2 Dec 2021 02:34:42 +0000 (UTC)
From: "Sam James" <sam@gentoo.org>
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" <sam@gentoo.org>
Message-ID: <1638412461.8f69aea9c3a148dcc961957e8004eaa0dc45be8b.sam@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/openvdb/, media-gfx/openvdb/files/
X-VCS-Repository: repo/gentoo
X-VCS-Files: media-gfx/openvdb/files/openvdb-9.0.0-unconditionally-search-Python-interpreter.patch media-gfx/openvdb/openvdb-9.0.0.ebuild
X-VCS-Directories: media-gfx/openvdb/files/ media-gfx/openvdb/
X-VCS-Committer: sam
X-VCS-Committer-Name: Sam James
X-VCS-Revision: 8f69aea9c3a148dcc961957e8004eaa0dc45be8b
X-VCS-Branch: master
Date: Thu, 2 Dec 2021 02:34:42 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: bca6da17-cd97-4b96-89f2-af0052b74e4a
X-Archives-Hash: 6c30d7763159446b0ce5e0590cc90890
commit: 8f69aea9c3a148dcc961957e8004eaa0dc45be8b
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 2 02:33:57 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Dec 2 02:34:21 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f69aea9
media-gfx/openvdb: tweak Python detection for 9.0.0
Let's try this. We might be able to drop the options we pass
in the ebuild entirely, but not wanting to mess too much
for a moment.
Bug: https://bugs.gentoo.org/790350
Signed-off-by: Sam James <sam <AT> gentoo.org>
...unconditionally-search-Python-interpreter.patch | 40 ++++++++++++++++++++++
media-gfx/openvdb/openvdb-9.0.0.ebuild | 1 +
2 files changed, 41 insertions(+)
diff --git a/media-gfx/openvdb/files/openvdb-9.0.0-unconditionally-search-Python-interpreter.patch b/media-gfx/openvdb/files/openvdb-9.0.0-unconditionally-search-Python-interpreter.patch
new file mode 100644
index 000000000000..66c50b485d70
--- /dev/null
+++ b/media-gfx/openvdb/files/openvdb-9.0.0-unconditionally-search-Python-interpreter.patch
@@ -0,0 +1,40 @@
+From e9b193cc3481c4e157aa39e753ce49a0da69bb2b Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Thu, 2 Dec 2021 02:16:15 +0000
+Subject: [PATCH] cmake: unconditionally search for Python interpreter
+
+When setting PYOPENVDB_INSTALL_DIRECTORY, CMake would fail with:
+```
+-- Could NOT find Python (missing: Python_LIBRARIES Development Development.Module Development.Embed) (found version "3.9.9")
+CMake Error at openvdb/openvdb/python/CMakeLists.txt:65 (message):
+ Could NOT find Python::Module (Required is at least version "2.7")
+Call Stack (most recent call first):
+ openvdb/openvdb/python/CMakeLists.txt:112 (openvdb_check_python_version)
+```
+
+It seems like we always need to search for the interpreter.
+
+Bug: https://bugs.gentoo.org/790350
+Signed-off-by: Sam James <sam@gentoo.org>
+---
+ openvdb/openvdb/python/CMakeLists.txt | 4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+
+diff --git a/openvdb/openvdb/python/CMakeLists.txt b/openvdb/openvdb/python/CMakeLists.txt
+index 2821efb5..af93976a 100644
+--- a/openvdb/openvdb/python/CMakeLists.txt
++++ b/openvdb/openvdb/python/CMakeLists.txt
+@@ -98,9 +98,7 @@ endfunction()
+ # https://github.com/AcademySoftwareFoundation/openvdb/issues/886
+ set(OPENVDB_PYTHON_DEPS)
+ set(OPENVDB_PYTHON_REQUIRED_COMPONENTS Development)
+-if(NOT DEFINED PYOPENVDB_INSTALL_DIRECTORY)
+- list(APPEND OPENVDB_PYTHON_REQUIRED_COMPONENTS Interpreter)
+-endif()
++list(APPEND OPENVDB_PYTHON_REQUIRED_COMPONENTS Interpreter)
+
+ if(USE_NUMPY)
+ list(APPEND OPENVDB_PYTHON_REQUIRED_COMPONENTS NumPy)
+--
+2.34.1
+
diff --git a/media-gfx/openvdb/openvdb-9.0.0.ebuild b/media-gfx/openvdb/openvdb-9.0.0.ebuild
index 898e80d496d6..60c18372ac5d 100644
--- a/media-gfx/openvdb/openvdb-9.0.0.ebuild
+++ b/media-gfx/openvdb/openvdb-9.0.0.ebuild
@@ -65,6 +65,7 @@ PATCHES=(
"${FILESDIR}/${PN}-7.1.0-0001-Fix-multilib-header-source.patch"
"${FILESDIR}/${PN}-8.1.0-glfw-libdir.patch"
"${FILESDIR}/${PN}-9.0.0-numpy.patch"
+ "${FILESDIR}/${PN}-9.0.0-unconditionally-search-Python-interpreter.patch"
)
pkg_setup() {