diff options
| author |   Ross Burton <ross.burton@arm.com> | 2023-05-04 16:22:53 +0100 |
|---|---|---|
| committer |   Khem Raj <raj.khem@gmail.com> | 2023-05-04 10:23:40 -0700 |
| commit | 15bc6cc2f0206a07c0e896f200fecd2da6145637 (patch) | |
| tree | d7e080bf6d3ecc29f3e88a6b425866e336413617 /meta-python/recipes-devtools/python/python3-ninja/run-ninja-from-path.patch | |
| parent | 20d63965da15558a17bfc38bd5c151d0353e0315 (diff) | |
| download | meta-openembedded-contrib-15bc6cc2f0206a07c0e896f200fecd2da6145637.tar.gz | |
python3-ninja: simplify recipe
Delete more code from __init__.py as we'll never be running from inside
a build tree.
Replace the use of skbuild.setup() with setuptools.setup(): the same
Python module is built and the only value-add is the potential build of
ninja, which we don't want and delete anyway.
This means we can remove most of the DEPENDS and RDEPENDS.
Signed-off-by: Ross Burton <ross.burton@arm.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 | 39 |
1 files changed, 36 insertions, 3 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 index 26bd037373..0068efcc3a 100644 --- 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 @@ -1,7 +1,40 @@ ---- ninja-1.11.1/src/ninja/__init__.py.old 2022-11-05 09:49:23.000000000 +0100 -+++ ninja-1.11.1/src/ninja/__init__.py 2023-03-10 09:45:13.452082888 +0100 -@@ -44,7 +44,7 @@ +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 <ross.burton@arm.com> + +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) |