| 1 |
commit: 8f69aea9c3a148dcc961957e8004eaa0dc45be8b |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Dec 2 02:33:57 2021 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Dec 2 02:34:21 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f69aea9 |
| 7 |
|
| 8 |
media-gfx/openvdb: tweak Python detection for 9.0.0 |
| 9 |
|
| 10 |
Let's try this. We might be able to drop the options we pass |
| 11 |
in the ebuild entirely, but not wanting to mess too much |
| 12 |
for a moment. |
| 13 |
|
| 14 |
Bug: https://bugs.gentoo.org/790350 |
| 15 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 16 |
|
| 17 |
...unconditionally-search-Python-interpreter.patch | 40 ++++++++++++++++++++++ |
| 18 |
media-gfx/openvdb/openvdb-9.0.0.ebuild | 1 + |
| 19 |
2 files changed, 41 insertions(+) |
| 20 |
|
| 21 |
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 |
| 22 |
new file mode 100644 |
| 23 |
index 000000000000..66c50b485d70 |
| 24 |
--- /dev/null |
| 25 |
+++ b/media-gfx/openvdb/files/openvdb-9.0.0-unconditionally-search-Python-interpreter.patch |
| 26 |
@@ -0,0 +1,40 @@ |
| 27 |
+From e9b193cc3481c4e157aa39e753ce49a0da69bb2b Mon Sep 17 00:00:00 2001 |
| 28 |
+From: Sam James <sam@g.o> |
| 29 |
+Date: Thu, 2 Dec 2021 02:16:15 +0000 |
| 30 |
+Subject: [PATCH] cmake: unconditionally search for Python interpreter |
| 31 |
+ |
| 32 |
+When setting PYOPENVDB_INSTALL_DIRECTORY, CMake would fail with: |
| 33 |
+``` |
| 34 |
+-- Could NOT find Python (missing: Python_LIBRARIES Development Development.Module Development.Embed) (found version "3.9.9") |
| 35 |
+CMake Error at openvdb/openvdb/python/CMakeLists.txt:65 (message): |
| 36 |
+ Could NOT find Python::Module (Required is at least version "2.7") |
| 37 |
+Call Stack (most recent call first): |
| 38 |
+ openvdb/openvdb/python/CMakeLists.txt:112 (openvdb_check_python_version) |
| 39 |
+``` |
| 40 |
+ |
| 41 |
+It seems like we always need to search for the interpreter. |
| 42 |
+ |
| 43 |
+Bug: https://bugs.gentoo.org/790350 |
| 44 |
+Signed-off-by: Sam James <sam@g.o> |
| 45 |
+--- |
| 46 |
+ openvdb/openvdb/python/CMakeLists.txt | 4 +--- |
| 47 |
+ 1 file changed, 1 insertion(+), 3 deletions(-) |
| 48 |
+ |
| 49 |
+diff --git a/openvdb/openvdb/python/CMakeLists.txt b/openvdb/openvdb/python/CMakeLists.txt |
| 50 |
+index 2821efb5..af93976a 100644 |
| 51 |
+--- a/openvdb/openvdb/python/CMakeLists.txt |
| 52 |
++++ b/openvdb/openvdb/python/CMakeLists.txt |
| 53 |
+@@ -98,9 +98,7 @@ endfunction() |
| 54 |
+ # https://github.com/AcademySoftwareFoundation/openvdb/issues/886 |
| 55 |
+ set(OPENVDB_PYTHON_DEPS) |
| 56 |
+ set(OPENVDB_PYTHON_REQUIRED_COMPONENTS Development) |
| 57 |
+-if(NOT DEFINED PYOPENVDB_INSTALL_DIRECTORY) |
| 58 |
+- list(APPEND OPENVDB_PYTHON_REQUIRED_COMPONENTS Interpreter) |
| 59 |
+-endif() |
| 60 |
++list(APPEND OPENVDB_PYTHON_REQUIRED_COMPONENTS Interpreter) |
| 61 |
+ |
| 62 |
+ if(USE_NUMPY) |
| 63 |
+ list(APPEND OPENVDB_PYTHON_REQUIRED_COMPONENTS NumPy) |
| 64 |
+-- |
| 65 |
+2.34.1 |
| 66 |
+ |
| 67 |
|
| 68 |
diff --git a/media-gfx/openvdb/openvdb-9.0.0.ebuild b/media-gfx/openvdb/openvdb-9.0.0.ebuild |
| 69 |
index 898e80d496d6..60c18372ac5d 100644 |
| 70 |
--- a/media-gfx/openvdb/openvdb-9.0.0.ebuild |
| 71 |
+++ b/media-gfx/openvdb/openvdb-9.0.0.ebuild |
| 72 |
@@ -65,6 +65,7 @@ PATCHES=( |
| 73 |
"${FILESDIR}/${PN}-7.1.0-0001-Fix-multilib-header-source.patch" |
| 74 |
"${FILESDIR}/${PN}-8.1.0-glfw-libdir.patch" |
| 75 |
"${FILESDIR}/${PN}-9.0.0-numpy.patch" |
| 76 |
+ "${FILESDIR}/${PN}-9.0.0-unconditionally-search-Python-interpreter.patch" |
| 77 |
) |
| 78 |
|
| 79 |
pkg_setup() { |
Archives