diff options
Diffstat (limited to 'upstream-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-ninja')
3 files changed, 15 insertions, 77 deletions
diff --git a/upstream-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-ninja/CMakeLists.txt b/upstream-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-ninja/CMakeLists.txt deleted file mode 100644 index 04fa451e72..0000000000 --- a/upstream-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-ninja/CMakeLists.txt +++ /dev/null @@ -1,9 +0,0 @@ -cmake_minimum_required(VERSION 3.15) - -project(NinjaPythonDistributions) - -set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_MODULE_PATH}) - -install(CODE " - message(STATUS \"Install ninja project\") -") diff --git a/upstream-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-ninja/no-scikit-build.patch b/upstream-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-ninja/no-scikit-build.patch index b7d191e244..4dfbb2675a 100644 --- a/upstream-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-ninja/no-scikit-build.patch +++ b/upstream-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-ninja/no-scikit-build.patch @@ -1,31 +1,22 @@ -We don't need to build ninja so there's no need to use scikit-build, -as we just need the python module with it's one ninja() function. +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> -diff --git a/pyproject.toml b/pyproject.toml -index b895c20..577b642 100644 --- a/pyproject.toml +++ b/pyproject.toml -@@ -2,7 +2,6 @@ - requires = [ - "setuptools >=42", - "setuptools-scm[toml]", -- "scikit-build", - ] - build-backend = "setuptools.build_meta" +@@ -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" -diff --git a/setup.py b/setup.py -index dbe1fbc..3259754 100755 ---- a/setup.py -+++ b/setup.py -@@ -5,7 +5,7 @@ import os - import sys - from distutils.text_file import TextFile - --from skbuild import setup -+from setuptools import setup - - # Add current folder to path - # This is required to import versioneer in an isolated pip build +@@ -7,3 +6,3 @@ + name = "ninja" +-dynamic = ["version", "readme"] ++dynamic = ["version"] + description = "Ninja is a small build system with a focus on speed" diff --git a/upstream-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-ninja/run-ninja-from-path.patch b/upstream-layers/meta-openembedded/meta-python/recipes-devtools/python/python3-ninja/run-ninja-from-path.patch deleted file mode 100644 index 0068efcc3a..0000000000 --- a/upstream-layers/meta-openembedded/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 <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(): |