diff options
| author | Ross Burton <ross.burton@arm.com> | 2025-07-29 18:14:17 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2025-08-04 18:04:04 +0100 |
| commit | 329d1b4dbe738ff629949f4224dda5cde7855cd3 (patch) | |
| tree | 38502eddf1ee8d048a709555dec62dbd8c906117 | |
| parent | 455e89f658404ac7b9d1c04dda0f789a03903236 (diff) | |
| download | poky-329d1b4dbe738ff629949f4224dda5cde7855cd3.tar.gz | |
clang: remove ninja-native DEPENDS
The cmake class depends on ninja-native already.
(From OE-Core rev: 8ed6ce66de1b54b8129a9895d8cfaf2bb3c3bbb2)
Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-devtools/clang/clang_git.bb | 2 | ||||
| -rw-r--r-- | meta/recipes-devtools/clang/compiler-rt-sanitizers_git.bb | 2 | ||||
| -rw-r--r-- | meta/recipes-devtools/clang/compiler-rt_git.bb | 2 | ||||
| -rw-r--r-- | meta/recipes-devtools/clang/libcxx_git.bb | 1 |
4 files changed, 3 insertions, 4 deletions
diff --git a/meta/recipes-devtools/clang/clang_git.bb b/meta/recipes-devtools/clang/clang_git.bb index dcd2cf145f..7c597eb031 100644 --- a/meta/recipes-devtools/clang/clang_git.bb +++ b/meta/recipes-devtools/clang/clang_git.bb | |||
| @@ -156,7 +156,7 @@ EXTRA_OECMAKE:append:class-target = "\ | |||
| 156 | -DLLVM_LIBDIR_SUFFIX=${LLVM_LIBDIR_SUFFIX} \ | 156 | -DLLVM_LIBDIR_SUFFIX=${LLVM_LIBDIR_SUFFIX} \ |
| 157 | " | 157 | " |
| 158 | 158 | ||
| 159 | DEPENDS = "binutils zlib zstd libffi libxml2 libxml2-native ninja-native swig-native llvm-tblgen-native" | 159 | DEPENDS = "binutils zlib zstd libffi libxml2 libxml2-native swig-native llvm-tblgen-native" |
| 160 | DEPENDS:append:class-nativesdk = " clang-crosssdk-${SDK_SYS} virtual/nativesdk-cross-binutils" | 160 | DEPENDS:append:class-nativesdk = " clang-crosssdk-${SDK_SYS} virtual/nativesdk-cross-binutils" |
| 161 | DEPENDS:append:class-target = " clang-cross-${TARGET_ARCH} ${@bb.utils.contains('TC_CXX_RUNTIME', 'llvm', 'compiler-rt libcxx', '', d)}" | 161 | DEPENDS:append:class-target = " clang-cross-${TARGET_ARCH} ${@bb.utils.contains('TC_CXX_RUNTIME', 'llvm', 'compiler-rt libcxx', '', d)}" |
| 162 | 162 | ||
diff --git a/meta/recipes-devtools/clang/compiler-rt-sanitizers_git.bb b/meta/recipes-devtools/clang/compiler-rt-sanitizers_git.bb index 1724aa9b93..c8bc42c4eb 100644 --- a/meta/recipes-devtools/clang/compiler-rt-sanitizers_git.bb +++ b/meta/recipes-devtools/clang/compiler-rt-sanitizers_git.bb | |||
| @@ -39,7 +39,7 @@ CXXFLAGS += "${COMPILER_RT} ${LIBCPLUSPLUS}" | |||
| 39 | TOOLCHAIN = "clang" | 39 | TOOLCHAIN = "clang" |
| 40 | TOOLCHAIN_NATIVE = "clang" | 40 | TOOLCHAIN_NATIVE = "clang" |
| 41 | 41 | ||
| 42 | DEPENDS += "ninja-native virtual/crypt compiler-rt" | 42 | DEPENDS += "virtual/crypt compiler-rt" |
| 43 | DEPENDS:append:class-native = " clang-native libxcrypt-native libcxx-native" | 43 | DEPENDS:append:class-native = " clang-native libxcrypt-native libcxx-native" |
| 44 | DEPENDS:append:class-nativesdk = " virtual/cross-c++ clang-native clang-crosssdk-${SDK_SYS} nativesdk-libxcrypt nativesdk-gcc-runtime" | 44 | DEPENDS:append:class-nativesdk = " virtual/cross-c++ clang-native clang-crosssdk-${SDK_SYS} nativesdk-libxcrypt nativesdk-gcc-runtime" |
| 45 | DEPENDS:append:class-target = " virtual/cross-c++ clang-cross-${TARGET_ARCH} virtual/${MLPREFIX}libc gcc-runtime" | 45 | DEPENDS:append:class-target = " virtual/cross-c++ clang-cross-${TARGET_ARCH} virtual/${MLPREFIX}libc gcc-runtime" |
diff --git a/meta/recipes-devtools/clang/compiler-rt_git.bb b/meta/recipes-devtools/clang/compiler-rt_git.bb index 2e442f4433..0179dc5559 100644 --- a/meta/recipes-devtools/clang/compiler-rt_git.bb +++ b/meta/recipes-devtools/clang/compiler-rt_git.bb | |||
| @@ -25,7 +25,7 @@ TUNE_CCARGS:remove = "-no-integrated-as" | |||
| 25 | 25 | ||
| 26 | INHIBIT_DEFAULT_DEPS = "1" | 26 | INHIBIT_DEFAULT_DEPS = "1" |
| 27 | 27 | ||
| 28 | DEPENDS += "ninja-native libgcc" | 28 | DEPENDS += "libgcc" |
| 29 | DEPENDS:append:class-target = " virtual/cross-c++ clang-cross-${TARGET_ARCH} virtual/${MLPREFIX}libc gcc-runtime" | 29 | DEPENDS:append:class-target = " virtual/cross-c++ clang-cross-${TARGET_ARCH} virtual/${MLPREFIX}libc gcc-runtime" |
| 30 | DEPENDS:append:class-nativesdk = " virtual/cross-c++ clang-native clang-crosssdk-${SDK_SYS} nativesdk-gcc-runtime" | 30 | DEPENDS:append:class-nativesdk = " virtual/cross-c++ clang-native clang-crosssdk-${SDK_SYS} nativesdk-gcc-runtime" |
| 31 | DEPENDS:append:class-native = " clang-native" | 31 | DEPENDS:append:class-native = " clang-native" |
diff --git a/meta/recipes-devtools/clang/libcxx_git.bb b/meta/recipes-devtools/clang/libcxx_git.bb index bd8276e694..6c584decc7 100644 --- a/meta/recipes-devtools/clang/libcxx_git.bb +++ b/meta/recipes-devtools/clang/libcxx_git.bb | |||
| @@ -21,7 +21,6 @@ PACKAGECONFIG[no-atomics] = "-D_LIBCXXABI_HAS_ATOMIC_BUILTINS=OFF -DCMAKE_SHARED | |||
| 21 | PACKAGECONFIG[compiler-rt] = "-DLIBCXX_USE_COMPILER_RT=ON -DLIBCXXABI_USE_COMPILER_RT=ON -DLIBUNWIND_USE_COMPILER_RT=ON,,compiler-rt" | 21 | PACKAGECONFIG[compiler-rt] = "-DLIBCXX_USE_COMPILER_RT=ON -DLIBCXXABI_USE_COMPILER_RT=ON -DLIBUNWIND_USE_COMPILER_RT=ON,,compiler-rt" |
| 22 | PACKAGECONFIG[unwind-shared] = "-DLIBUNWIND_ENABLE_SHARED=ON,-DLIBUNWIND_ENABLE_SHARED=OFF,," | 22 | PACKAGECONFIG[unwind-shared] = "-DLIBUNWIND_ENABLE_SHARED=ON,-DLIBUNWIND_ENABLE_SHARED=OFF,," |
| 23 | 23 | ||
| 24 | DEPENDS += "ninja-native" | ||
| 25 | DEPENDS:append:class-target = " virtual/cross-c++ clang-cross-${TARGET_ARCH} virtual/${MLPREFIX}libc virtual/${MLPREFIX}compilerlibs" | 24 | DEPENDS:append:class-target = " virtual/cross-c++ clang-cross-${TARGET_ARCH} virtual/${MLPREFIX}libc virtual/${MLPREFIX}compilerlibs" |
| 26 | DEPENDS:append:class-nativesdk = " virtual/cross-c++ clang-crosssdk-${SDK_SYS} nativesdk-compiler-rt" | 25 | DEPENDS:append:class-nativesdk = " virtual/cross-c++ clang-crosssdk-${SDK_SYS} nativesdk-compiler-rt" |
| 27 | DEPENDS:append:class-native = " clang-native compiler-rt-native" | 26 | DEPENDS:append:class-native = " clang-native compiler-rt-native" |
