summaryrefslogtreecommitdiffstats
path: root/meta-python
diff options
context:
space:
mode:
Diffstat (limited to 'meta-python')
-rw-r--r--meta-python/recipes-devtools/python/python3-scikit-build-core/0001-Find-cmake-from-PATH-instead-of-CMAKE_BIN_DIR.patch47
-rw-r--r--meta-python/recipes-devtools/python/python3-scikit-build-core_0.11.6.bb5
2 files changed, 51 insertions, 1 deletions
diff --git a/meta-python/recipes-devtools/python/python3-scikit-build-core/0001-Find-cmake-from-PATH-instead-of-CMAKE_BIN_DIR.patch b/meta-python/recipes-devtools/python/python3-scikit-build-core/0001-Find-cmake-from-PATH-instead-of-CMAKE_BIN_DIR.patch
new file mode 100644
index 0000000000..71319c0245
--- /dev/null
+++ b/meta-python/recipes-devtools/python/python3-scikit-build-core/0001-Find-cmake-from-PATH-instead-of-CMAKE_BIN_DIR.patch
@@ -0,0 +1,47 @@
1From deb225d2aaeb44f6a4c01eab25624193351f7f58 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Zolt=C3=A1n=20B=C3=B6sz=C3=B6rm=C3=A9nyi?=
3 <zboszor@gmail.com>
4Date: Wed, 12 Nov 2025 09:56:59 +0100
5Subject: [PATCH] Find cmake from PATH instead of CMAKE_BIN_DIR
6MIME-Version: 1.0
7Content-Type: text/plain; charset=UTF-8
8Content-Transfer-Encoding: 8bit
9
10python3-cmake is patched to run cmake from PATH.
11
12Another detail called CMAKE_BIN_DIR is not patched out, but
13scikit-build-core prefers using it in its program_search.py.
14It also has a fallback to find cmake from PATH.
15
16Remove using CMAKE_BIN_DIR and keep the fallback.
17
18Signed-off-by: Zoltán Böszörményi <zboszor@gmail.com>
19Upstream-Status: Inappropriate [oe specific]
20---
21 src/scikit_build_core/program_search.py | 10 ----------
22 1 file changed, 10 deletions(-)
23
24diff --git a/src/scikit_build_core/program_search.py b/src/scikit_build_core/program_search.py
25index 7995c14..f82cad3 100644
26--- a/src/scikit_build_core/program_search.py
27+++ b/src/scikit_build_core/program_search.py
28@@ -90,16 +90,6 @@ class Program(NamedTuple):
29
30
31 def _get_cmake_path(*, module: bool = True) -> Generator[Path, None, None]:
32- """
33- Get the path to CMake.
34- """
35- if module:
36- with contextlib.suppress(ImportError):
37- # If a "cmake" directory exists, this will also ImportError
38- from cmake import CMAKE_BIN_DIR
39-
40- yield Path(CMAKE_BIN_DIR) / "cmake"
41-
42 candidates = ("cmake3", "cmake")
43 for candidate in candidates:
44 cmake_path = shutil.which(candidate)
45--
462.51.1
47
diff --git a/meta-python/recipes-devtools/python/python3-scikit-build-core_0.11.6.bb b/meta-python/recipes-devtools/python/python3-scikit-build-core_0.11.6.bb
index 73cbf2a3f9..93a83ead65 100644
--- a/meta-python/recipes-devtools/python/python3-scikit-build-core_0.11.6.bb
+++ b/meta-python/recipes-devtools/python/python3-scikit-build-core_0.11.6.bb
@@ -9,7 +9,10 @@ DEPENDS = "python3-hatch-vcs-native"
9 9
10inherit pypi python_hatchling 10inherit pypi python_hatchling
11 11
12SRC_URI += "file://0001-builder.py-Check-PYTHON_INCLUDE_DIR.patch" 12SRC_URI += " \
13 file://0001-builder.py-Check-PYTHON_INCLUDE_DIR.patch \
14 file://0001-Find-cmake-from-PATH-instead-of-CMAKE_BIN_DIR.patch \
15"
13SRC_URI[sha256sum] = "5982ccd839735be99cfd3b92a8847c6c196692f476c215da84b79d2ad12f9f1b" 16SRC_URI[sha256sum] = "5982ccd839735be99cfd3b92a8847c6c196692f476c215da84b79d2ad12f9f1b"
14 17
15BBCLASSEXTEND = "native nativesdk" 18BBCLASSEXTEND = "native nativesdk"