mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2025-07-19 15:29:08 +02:00
15bc6cc2f0
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>
45 lines
1.7 KiB
Diff
45 lines
1.7 KiB
Diff
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)
|
|
+ return subprocess.call([name] + args, close_fds=False)
|
|
|
|
|
|
def ninja():
|