diff options
author | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | 2021-08-02 09:45:55 -0700 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2021-08-03 10:00:28 -0700 |
commit | 17737cc4ecd3aea2c978bf83e283bcb08d097487 (patch) | |
tree | a4386a37907d9110572105af80ebe5a1c5bf3819 /recipes-devtools/clang/libcxx_git.bb | |
parent | 527f628b7d9bbfe8d3fbe743e876d30c4545a71a (diff) | |
download | meta-clang-17737cc4ecd3aea2c978bf83e283bcb08d097487.tar.gz |
meta-clang: Convert to new override syntax
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'recipes-devtools/clang/libcxx_git.bb')
-rw-r--r-- | recipes-devtools/clang/libcxx_git.bb | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/recipes-devtools/clang/libcxx_git.bb b/recipes-devtools/clang/libcxx_git.bb index b143f8c..9ee3d34 100644 --- a/recipes-devtools/clang/libcxx_git.bb +++ b/recipes-devtools/clang/libcxx_git.bb | |||
@@ -11,8 +11,8 @@ require common-source.inc | |||
11 | inherit cmake cmake-native python3native | 11 | inherit cmake cmake-native python3native |
12 | 12 | ||
13 | PACKAGECONFIG ??= "compiler-rt exceptions ${@bb.utils.contains("RUNTIME", "llvm", "unwind unwind-shared", "", d)}" | 13 | PACKAGECONFIG ??= "compiler-rt exceptions ${@bb.utils.contains("RUNTIME", "llvm", "unwind unwind-shared", "", d)}" |
14 | PACKAGECONFIG_append_armv5 = " no-atomics" | 14 | PACKAGECONFIG:append:armv5 = " no-atomics" |
15 | PACKAGECONFIG_remove_class-native = "compiler-rt" | 15 | PACKAGECONFIG:remove:class-native = "compiler-rt" |
16 | PACKAGECONFIG[unwind] = "-DLIBCXXABI_USE_LLVM_UNWINDER=ON -DLIBCXXABI_ENABLE_STATIC_UNWINDER=ON,-DLIBCXXABI_USE_LLVM_UNWINDER=OFF,," | 16 | PACKAGECONFIG[unwind] = "-DLIBCXXABI_USE_LLVM_UNWINDER=ON -DLIBCXXABI_ENABLE_STATIC_UNWINDER=ON,-DLIBCXXABI_USE_LLVM_UNWINDER=OFF,," |
17 | PACKAGECONFIG[exceptions] = "-DLIBCXXABI_ENABLE_EXCEPTIONS=ON -DDLIBCXX_ENABLE_EXCEPTIONS=ON,-DLIBCXXABI_ENABLE_EXCEPTIONS=OFF -DLIBCXX_ENABLE_EXCEPTIONS=OFF -DCMAKE_REQUIRED_FLAGS='-fno-exceptions'," | 17 | PACKAGECONFIG[exceptions] = "-DLIBCXXABI_ENABLE_EXCEPTIONS=ON -DDLIBCXX_ENABLE_EXCEPTIONS=ON,-DLIBCXXABI_ENABLE_EXCEPTIONS=OFF -DLIBCXX_ENABLE_EXCEPTIONS=OFF -DCMAKE_REQUIRED_FLAGS='-fno-exceptions'," |
18 | PACKAGECONFIG[no-atomics] = "-D_LIBCXXABI_HAS_ATOMIC_BUILTINS=OFF -DCMAKE_SHARED_LINKER_FLAGS='-latomic',," | 18 | PACKAGECONFIG[no-atomics] = "-D_LIBCXXABI_HAS_ATOMIC_BUILTINS=OFF -DCMAKE_SHARED_LINKER_FLAGS='-latomic',," |
@@ -20,20 +20,20 @@ PACKAGECONFIG[compiler-rt] = "-DLIBCXX_USE_COMPILER_RT=ON -DLIBCXXABI_USE_COMPIL | |||
20 | PACKAGECONFIG[unwind-shared] = "-DLIBUNWIND_ENABLE_SHARED=ON,-DLIBUNWIND_ENABLE_SHARED=OFF,," | 20 | PACKAGECONFIG[unwind-shared] = "-DLIBUNWIND_ENABLE_SHARED=ON,-DLIBUNWIND_ENABLE_SHARED=OFF,," |
21 | 21 | ||
22 | DEPENDS += "ninja-native" | 22 | DEPENDS += "ninja-native" |
23 | DEPENDS_append_class-target = " clang-cross-${TARGET_ARCH} virtual/${MLPREFIX}libc virtual/${TARGET_PREFIX}compilerlibs" | 23 | DEPENDS:append:class-target = " clang-cross-${TARGET_ARCH} virtual/${MLPREFIX}libc virtual/${TARGET_PREFIX}compilerlibs" |
24 | DEPENDS_append_class-native = " clang-native" | 24 | DEPENDS:append:class-native = " clang-native" |
25 | 25 | ||
26 | LIBCPLUSPLUS = "" | 26 | LIBCPLUSPLUS = "" |
27 | COMPILER_RT ?= "-rtlib=compiler-rt" | 27 | COMPILER_RT ?= "-rtlib=compiler-rt" |
28 | 28 | ||
29 | CC_append_toolchain-clang_class-native = " -unwindlib=libgcc -rtlib=libgcc" | 29 | CC:append:toolchain-clang:class-native = " -unwindlib=libgcc -rtlib=libgcc" |
30 | 30 | ||
31 | CXXFLAGS += "-stdlib=libstdc++" | 31 | CXXFLAGS += "-stdlib=libstdc++" |
32 | LDFLAGS += "-unwindlib=libgcc -stdlib=libstdc++" | 32 | LDFLAGS += "-unwindlib=libgcc -stdlib=libstdc++" |
33 | BUILD_CXXFLAGS += "-stdlib=libstdc++" | 33 | BUILD_CXXFLAGS += "-stdlib=libstdc++" |
34 | BUILD_LDFLAGS += "-unwindlib=libgcc -rtlib=libgcc -stdlib=libstdc++" | 34 | BUILD_LDFLAGS += "-unwindlib=libgcc -rtlib=libgcc -stdlib=libstdc++" |
35 | BUILD_CPPFLAGS_remove = "-stdlib=libc++" | 35 | BUILD_CPPFLAGS:remove = "-stdlib=libc++" |
36 | BUILD_LDFLAGS_remove = "-stdlib=libc++ -lc++abi" | 36 | BUILD_LDFLAGS:remove = "-stdlib=libc++ -lc++abi" |
37 | 37 | ||
38 | INHIBIT_DEFAULT_DEPS = "1" | 38 | INHIBIT_DEFAULT_DEPS = "1" |
39 | 39 | ||
@@ -42,7 +42,7 @@ LIC_FILES_CHKSUM = "file://libcxx/LICENSE.TXT;md5=55d89dd7eec8d3b4204b680e27da39 | |||
42 | file://libunwind/LICENSE.TXT;md5=f66970035d12f196030658b11725e1a1 \ | 42 | file://libunwind/LICENSE.TXT;md5=f66970035d12f196030658b11725e1a1 \ |
43 | " | 43 | " |
44 | 44 | ||
45 | LLVM_LIBDIR_SUFFIX_powerpc64 = "64" | 45 | LLVM_LIBDIR_SUFFIX:powerpc64 = "64" |
46 | 46 | ||
47 | OECMAKE_TARGET_COMPILE = "cxxabi cxx" | 47 | OECMAKE_TARGET_COMPILE = "cxxabi cxx" |
48 | OECMAKE_TARGET_INSTALL = "install-cxx install-cxxabi ${@bb.utils.contains("RUNTIME", "llvm", "install-unwind", "", d)}" | 48 | OECMAKE_TARGET_INSTALL = "install-cxx install-cxxabi ${@bb.utils.contains("RUNTIME", "llvm", "install-unwind", "", d)}" |
@@ -63,31 +63,31 @@ EXTRA_OECMAKE += "\ | |||
63 | -DLLVM_LIBDIR_SUFFIX=${LLVM_LIBDIR_SUFFIX} \ | 63 | -DLLVM_LIBDIR_SUFFIX=${LLVM_LIBDIR_SUFFIX} \ |
64 | " | 64 | " |
65 | 65 | ||
66 | EXTRA_OECMAKE_append_class-target = " \ | 66 | EXTRA_OECMAKE:append:class-target = " \ |
67 | -DCMAKE_AR=${STAGING_BINDIR_TOOLCHAIN}/${AR} \ | 67 | -DCMAKE_AR=${STAGING_BINDIR_TOOLCHAIN}/${AR} \ |
68 | -DCMAKE_NM=${STAGING_BINDIR_TOOLCHAIN}/${NM} \ | 68 | -DCMAKE_NM=${STAGING_BINDIR_TOOLCHAIN}/${NM} \ |
69 | -DCMAKE_RANLIB=${STAGING_BINDIR_TOOLCHAIN}/${RANLIB} \ | 69 | -DCMAKE_RANLIB=${STAGING_BINDIR_TOOLCHAIN}/${RANLIB} \ |
70 | -DLLVM_DEFAULT_TARGET_TRIPLE=${HOST_SYS} \ | 70 | -DLLVM_DEFAULT_TARGET_TRIPLE=${HOST_SYS} \ |
71 | " | 71 | " |
72 | EXTRA_OECMAKE_append_class-native = " -DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF \ | 72 | EXTRA_OECMAKE:append:class-native = " -DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF \ |
73 | " | 73 | " |
74 | 74 | ||
75 | EXTRA_OECMAKE_append_class-nativesdk = " -DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF \ | 75 | EXTRA_OECMAKE:append:class-nativesdk = " -DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF \ |
76 | -DCMAKE_AR=${STAGING_BINDIR_TOOLCHAIN}/${AR} \ | 76 | -DCMAKE_AR=${STAGING_BINDIR_TOOLCHAIN}/${AR} \ |
77 | -DCMAKE_NM=${STAGING_BINDIR_TOOLCHAIN}/${NM} \ | 77 | -DCMAKE_NM=${STAGING_BINDIR_TOOLCHAIN}/${NM} \ |
78 | -DCMAKE_RANLIB=${STAGING_BINDIR_TOOLCHAIN}/${RANLIB} \ | 78 | -DCMAKE_RANLIB=${STAGING_BINDIR_TOOLCHAIN}/${RANLIB} \ |
79 | -DLLVM_DEFAULT_TARGET_TRIPLE=${HOST_SYS} \ | 79 | -DLLVM_DEFAULT_TARGET_TRIPLE=${HOST_SYS} \ |
80 | " | 80 | " |
81 | 81 | ||
82 | EXTRA_OECMAKE_append_libc-musl = " -DLIBCXX_HAS_MUSL_LIBC=ON " | 82 | EXTRA_OECMAKE:append:libc-musl = " -DLIBCXX_HAS_MUSL_LIBC=ON " |
83 | 83 | ||
84 | CXXFLAGS_append_armv5 = " -mfpu=vfp2" | 84 | CXXFLAGS:append:armv5 = " -mfpu=vfp2" |
85 | 85 | ||
86 | ALLOW_EMPTY_${PN} = "1" | 86 | ALLOW_EMPTY:${PN} = "1" |
87 | 87 | ||
88 | PROVIDES_append_runtime-llvm = " libunwind" | 88 | PROVIDES:append_runtime-llvm = " libunwind" |
89 | 89 | ||
90 | do_install_append() { | 90 | do_install:append() { |
91 | if ${@bb.utils.contains("RUNTIME", "llvm", "true", "false", d)} | 91 | if ${@bb.utils.contains("RUNTIME", "llvm", "true", "false", d)} |
92 | then | 92 | then |
93 | install -Dm 0644 ${S}/libunwind/include/libunwind.h ${S}/libunwind/include/__libunwind_config.h ${D}${includedir} | 93 | install -Dm 0644 ${S}/libunwind/include/libunwind.h ${S}/libunwind/include/__libunwind_config.h ${D}${includedir} |
@@ -97,8 +97,8 @@ do_install_append() { | |||
97 | fi | 97 | fi |
98 | } | 98 | } |
99 | 99 | ||
100 | PACKAGES_append_runtime-llvm = " libunwind" | 100 | PACKAGES:append_runtime-llvm = " libunwind" |
101 | FILES_libunwind_runtime-llvm = "${libdir}/libunwind.so.*" | 101 | FILES:libunwind_runtime-llvm = "${libdir}/libunwind.so.*" |
102 | 102 | ||
103 | BBCLASSEXTEND = "native nativesdk" | 103 | BBCLASSEXTEND = "native nativesdk" |
104 | TOOLCHAIN_forcevariable = "clang" | 104 | TOOLCHAIN:forcevariable = "clang" |