From c89eb13f4eef40cc1e890759279e97f17fae048d Mon Sep 17 00:00:00 2001
From: Derek Straka <derek@asterius.io>
Date: Thu, 12 Dec 2024 20:37:22 +0000
Subject: python3-cmake: update to version 3.31.1

Signed-off-by: Derek Straka <derek@asterius.io>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 .../python/python3-cmake/run-cmake-from-path.patch | 20 ++++++------
 .../python/python3-cmake_3.28.3.bb                 | 37 ---------------------
 .../python/python3-cmake_3.31.1.bb                 | 38 ++++++++++++++++++++++
 3 files changed, 48 insertions(+), 47 deletions(-)
 delete mode 100644 meta-python/recipes-devtools/python/python3-cmake_3.28.3.bb
 create mode 100644 meta-python/recipes-devtools/python/python3-cmake_3.31.1.bb

(limited to 'meta-python/recipes-devtools/python')

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.28.3.bb
deleted file mode 100644
index a6c3e139b8..0000000000
--- a/meta-python/recipes-devtools/python/python3-cmake_3.28.3.bb
+++ /dev/null
@@ -1,37 +0,0 @@
-SUMMARY = "CMake is an open-source, cross-platform family of tools designed to build, test and package software"
-LICENSE = "BSD-3-Clause & Apache-2.0"
-LIC_FILES_CHKSUM = " \
-	file://LICENSE_BSD_3;md5=9134cb61aebbdd79dd826ccb9ae6afcd \
-	file://LICENSE_Apache_20;md5=19cbd64715b51267a47bf3750cc6a8a5 \
-"
-
-DEPENDS = "ninja-native cmake-native python3-scikit-build-native"
-
-PYPI_PACKAGE = "cmake"
-PYPI_ARCHIVE_NAME_PREFIX = "pypi-"
-
-inherit pypi python_setuptools_build_meta
-SRC_URI[sha256sum] = "a8092815c739da7d6775c26ec30c2645f0fca9527a29e36a682faec7d39cde89"
-
-SRC_URI += " \
-	file://CMakeLists.txt \
-	file://run-cmake-from-path.patch \
-"
-
-addtask do_patchbuild after do_patch before do_configure
-
-do_patchbuild () {
-	rm -f ${S}/CMakeLists.txt
-	cp ${UNPACKDIR}/CMakeLists.txt ${S}/
-}
-
-do_install:append () {
-	rm -rf ${D}${bindir}
-}
-
-RDEPENDS:${PN} = " \
-	cmake \
-	python3-scikit-build \
-"
-
-BBCLASSEXTEND = "native nativesdk"
diff --git a/meta-python/recipes-devtools/python/python3-cmake_3.31.1.bb b/meta-python/recipes-devtools/python/python3-cmake_3.31.1.bb
new file mode 100644
index 0000000000..5e75246ecf
--- /dev/null
+++ b/meta-python/recipes-devtools/python/python3-cmake_3.31.1.bb
@@ -0,0 +1,38 @@
+SUMMARY = "CMake is an open-source, cross-platform family of tools designed to build, test and package software"
+LICENSE = "BSD-3-Clause & Apache-2.0"
+LIC_FILES_CHKSUM = " \
+	file://LICENSE_BSD_3;md5=9134cb61aebbdd79dd826ccb9ae6afcd \
+	file://LICENSE_Apache_20;md5=19cbd64715b51267a47bf3750cc6a8a5 \
+"
+
+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] = "45e09ef6fc5a0d3d4cac11bfee43ba3f9925f301660630d3d1e5457fbe12ecdf"
+
+SRC_URI += " \
+	file://CMakeLists.txt \
+	file://run-cmake-from-path.patch \
+"
+
+addtask do_patchbuild after do_patch before do_configure
+
+do_patchbuild () {
+	rm -f ${S}/CMakeLists.txt
+	cp ${UNPACKDIR}/CMakeLists.txt ${S}/
+}
+
+do_install:append () {
+	rm -rf ${D}${bindir}
+}
+
+RDEPENDS:${PN} = " \
+	cmake \
+	python3-scikit-build \
+	python3-scikit-build-core \
+"
+
+BBCLASSEXTEND = "native nativesdk"
-- 
cgit v1.2.3-54-g00ecf