diff --git a/meta-python/recipes-devtools/python/python3-cmake/run-cmake-from-path.patch b/meta-python/recipes-devtools/python/python3-cmake/run-cmake-from-path.patch index d4d2903d5e..7b4190a70f 100644 --- a/meta-python/recipes-devtools/python/python3-cmake/run-cmake-from-path.patch +++ b/meta-python/recipes-devtools/python/python3-cmake/run-cmake-from-path.patch @@ -1,13 +1,13 @@ Upstream-Status: Pending ---- cmake-3.25.2/src/cmake/__init__.py.old 2023-03-10 09:40:43.582315753 +0100 -+++ cmake-3.25.2/src/cmake/__init__.py 2023-03-10 09:41:38.030874047 +0100 -@@ -36,7 +36,7 @@ - - - def _program(name, args): -- return subprocess.call([os.path.join(CMAKE_BIN_DIR, name)] + args, close_fds=False) +--- cmake-3.25.2/src/cmake/__init__.py.old 2024-12-12 20:25:48.207389622 +0000 ++++ cmake-3.25.2/src/cmake/__init__.py 2024-12-12 20:25:48.207389622 +0000 +@@ -44,7 +44,7 @@ + + + def _program(name: str, args: Iterable[str]) -> int: +- return subprocess.call([os.path.join(CMAKE_BIN_DIR, name), *args], close_fds=False) + return subprocess.call([name] + args, close_fds=False) - - - def cmake(): + + def _program_exit(name: str, *args: str) -> NoReturn: + if sys.platform.startswith("win"): diff --git a/meta-python/recipes-devtools/python/python3-cmake_3.28.3.bb b/meta-python/recipes-devtools/python/python3-cmake_3.31.1.bb similarity index 84% rename from meta-python/recipes-devtools/python/python3-cmake_3.28.3.bb rename to meta-python/recipes-devtools/python/python3-cmake_3.31.1.bb index a6c3e139b8..5e75246ecf 100644 --- a/meta-python/recipes-devtools/python/python3-cmake_3.28.3.bb +++ b/meta-python/recipes-devtools/python/python3-cmake_3.31.1.bb @@ -5,13 +5,13 @@ LIC_FILES_CHKSUM = " \ file://LICENSE_Apache_20;md5=19cbd64715b51267a47bf3750cc6a8a5 \ " -DEPENDS = "ninja-native cmake-native python3-scikit-build-native" +DEPENDS = "ninja-native cmake-native python3-scikit-build-native python3-scikit-build-core-native" PYPI_PACKAGE = "cmake" PYPI_ARCHIVE_NAME_PREFIX = "pypi-" inherit pypi python_setuptools_build_meta -SRC_URI[sha256sum] = "a8092815c739da7d6775c26ec30c2645f0fca9527a29e36a682faec7d39cde89" +SRC_URI[sha256sum] = "45e09ef6fc5a0d3d4cac11bfee43ba3f9925f301660630d3d1e5457fbe12ecdf" SRC_URI += " \ file://CMakeLists.txt \ @@ -32,6 +32,7 @@ do_install:append () { RDEPENDS:${PN} = " \ cmake \ python3-scikit-build \ + python3-scikit-build-core \ " BBCLASSEXTEND = "native nativesdk"