From 16a72067f53cd667e674e77913586b3693c51ef2 Mon Sep 17 00:00:00 2001 From: Jiaying Song Date: Mon, 16 Mar 2026 17:34:42 +0800 Subject: python3-ninja: upgrade 1.11.1.1 -> 1.13.0 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 Signed-off-by: Khem Raj --- .../python/python3-ninja/run-ninja-from-path.patch | 44 ---------------------- 1 file changed, 44 deletions(-) delete mode 100644 meta-python/recipes-devtools/python/python3-ninja/run-ninja-from-path.patch (limited to 'meta-python/recipes-devtools/python/python3-ninja/run-ninja-from-path.patch') diff --git a/meta-python/recipes-devtools/python/python3-ninja/run-ninja-from-path.patch b/meta-python/recipes-devtools/python/python3-ninja/run-ninja-from-path.patch deleted file mode 100644 index 0068efcc3a..0000000000 --- a/meta-python/recipes-devtools/python/python3-ninja/run-ninja-from-path.patch +++ /dev/null @@ -1,44 +0,0 @@ -There's no need to hunt around source or install trees when we're just running ninja -from PATH. - -Upstream-Status: Inappropriate -Signed-off-by: Ross Burton - -diff --git a/src/ninja/__init__.py b/src/ninja/__init__.py -index f83767e..31bb926 100644 ---- a/src/ninja/__init__.py -+++ b/src/ninja/__init__.py -@@ -19,32 +19,9 @@ except ImportError: - os.path.dirname(__file__), '../../Ninja-src/misc'))) - from ninja_syntax import Writer, escape, expand # noqa: F401 - --DATA = os.path.join(os.path.dirname(__file__), 'data') -- --# Support running tests from the source tree --if not os.path.exists(DATA): -- from skbuild.constants import CMAKE_INSTALL_DIR as SKBUILD_CMAKE_INSTALL_DIR -- from skbuild.constants import set_skbuild_plat_name -- -- if platform.system().lower() == "darwin": -- # Since building the project specifying --plat-name or CMAKE_OSX_* variables -- # leads to different SKBUILD_DIR, the code below attempt to guess the most -- # likely plat-name. -- _skbuild_dirs = os.listdir(os.path.join(os.path.dirname(__file__), '..', '..', '_skbuild')) -- if _skbuild_dirs: -- _likely_plat_name = '-'.join(_skbuild_dirs[0].split('-')[:3]) -- set_skbuild_plat_name(_likely_plat_name) -- -- _data = os.path.abspath(os.path.join( -- os.path.dirname(__file__), '..', '..', SKBUILD_CMAKE_INSTALL_DIR(), 'src/ninja/data')) -- if os.path.exists(_data): -- DATA = _data -- --BIN_DIR = os.path.join(DATA, 'bin') -- - - def _program(name, args): -- return subprocess.call([os.path.join(BIN_DIR, name)] + args, close_fds=False) -+ return subprocess.call([name] + args, close_fds=False) - - - def ninja(): -- cgit v1.2.3-54-g00ecf