diff options
| author | Jiaying Song <jiaying.song.cn@windriver.com> | 2026-03-16 17:34:42 +0800 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2026-03-18 14:33:27 -0700 |
| commit | 16a72067f53cd667e674e77913586b3693c51ef2 (patch) | |
| tree | 1425942222f22c4ee131870e1d1cbd61aa6a1099 /meta-python/recipes-devtools/python/python3-ninja/run-ninja-from-path.patch | |
| parent | f75f4164fd7184ed47e119c782cea583b96fbb45 (diff) | |
| download | meta-openembedded-16a72067f53cd667e674e77913586b3693c51ef2.tar.gz | |
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 <jiaying.song.cn@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-python/recipes-devtools/python/python3-ninja/run-ninja-from-path.patch')
| -rw-r--r-- | meta-python/recipes-devtools/python/python3-ninja/run-ninja-from-path.patch | 44 |
1 files changed, 0 insertions, 44 deletions
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 @@ | |||
| 1 | There's no need to hunt around source or install trees when we're just running ninja | ||
| 2 | from PATH. | ||
| 3 | |||
| 4 | Upstream-Status: Inappropriate | ||
| 5 | Signed-off-by: Ross Burton <ross.burton@arm.com> | ||
| 6 | |||
| 7 | diff --git a/src/ninja/__init__.py b/src/ninja/__init__.py | ||
| 8 | index f83767e..31bb926 100644 | ||
| 9 | --- a/src/ninja/__init__.py | ||
| 10 | +++ b/src/ninja/__init__.py | ||
| 11 | @@ -19,32 +19,9 @@ except ImportError: | ||
| 12 | os.path.dirname(__file__), '../../Ninja-src/misc'))) | ||
| 13 | from ninja_syntax import Writer, escape, expand # noqa: F401 | ||
| 14 | |||
| 15 | -DATA = os.path.join(os.path.dirname(__file__), 'data') | ||
| 16 | - | ||
| 17 | -# Support running tests from the source tree | ||
| 18 | -if not os.path.exists(DATA): | ||
| 19 | - from skbuild.constants import CMAKE_INSTALL_DIR as SKBUILD_CMAKE_INSTALL_DIR | ||
| 20 | - from skbuild.constants import set_skbuild_plat_name | ||
| 21 | - | ||
| 22 | - if platform.system().lower() == "darwin": | ||
| 23 | - # Since building the project specifying --plat-name or CMAKE_OSX_* variables | ||
| 24 | - # leads to different SKBUILD_DIR, the code below attempt to guess the most | ||
| 25 | - # likely plat-name. | ||
| 26 | - _skbuild_dirs = os.listdir(os.path.join(os.path.dirname(__file__), '..', '..', '_skbuild')) | ||
| 27 | - if _skbuild_dirs: | ||
| 28 | - _likely_plat_name = '-'.join(_skbuild_dirs[0].split('-')[:3]) | ||
| 29 | - set_skbuild_plat_name(_likely_plat_name) | ||
| 30 | - | ||
| 31 | - _data = os.path.abspath(os.path.join( | ||
| 32 | - os.path.dirname(__file__), '..', '..', SKBUILD_CMAKE_INSTALL_DIR(), 'src/ninja/data')) | ||
| 33 | - if os.path.exists(_data): | ||
| 34 | - DATA = _data | ||
| 35 | - | ||
| 36 | -BIN_DIR = os.path.join(DATA, 'bin') | ||
| 37 | - | ||
| 38 | |||
| 39 | def _program(name, args): | ||
| 40 | - return subprocess.call([os.path.join(BIN_DIR, name)] + args, close_fds=False) | ||
| 41 | + return subprocess.call([name] + args, close_fds=False) | ||
| 42 | |||
| 43 | |||
| 44 | def ninja(): | ||
