mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-03-23 14:30:26 +00:00
16a72067f5
Changelog: https://github.com/scikit-build/ninja-python-distributions/releases Upstream commit [1] switched build system from scikit-build to scikit-build-core, which changed pyproject.toml structure and rewrote __init__.py. Update patches accordingly: - no-scikit-build.patch: rewrite for new pyproject.toml structure, replace scikit-build-core with setuptools, and remove 'readme' from dynamic fields as setuptools cannot handle the fancy-pypi-readme plugin. - run-ninja-from-path.patch: drop. Old version imported skbuild modules in __init__.py which caused ImportError in OE since scikit-build is not installed. New version replaced these imports with stdlib sysconfig, so the patch is no longer needed. - CMakeLists.txt: drop. This was a stub file added to prevent scikit-build from failing when it could not find CMakeLists.txt. Since we now use setuptools which does not require it, the file can be removed. [1] https://github.com/scikit-build/ninja-python-distributions/commit/f3b4a786be Signed-off-by: Jiaying Song <jiaying.song.cn@windriver.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
23 lines
702 B
Diff
23 lines
702 B
Diff
We don't need to build ninja so there's no need to use scikit-build-core,
|
|
as we just need the python module with its one ninja() function.
|
|
|
|
Upstream-Status: Inappropriate
|
|
Signed-off-by: Ross Burton <ross.burton@arm.com>
|
|
Signed-off-by: Jiaying Song <jiaying.song.cn@windriver.com>
|
|
|
|
--- a/pyproject.toml
|
|
+++ b/pyproject.toml
|
|
@@ -1,5 +1,4 @@
|
|
[build-system]
|
|
-requires = ["scikit-build-core>=0.10"]
|
|
-build-backend = "backend"
|
|
-backend-path = ["_build_backend"]
|
|
+requires = ["setuptools", "setuptools-scm"]
|
|
+build-backend = "setuptools.build_meta"
|
|
|
|
@@ -7,3 +6,3 @@
|
|
name = "ninja"
|
|
-dynamic = ["version", "readme"]
|
|
+dynamic = ["version"]
|
|
description = "Ninja is a small build system with a focus on speed"
|