From 17737cc4ecd3aea2c978bf83e283bcb08d097487 Mon Sep 17 00:00:00 2001 From: "Signed-off-by: Martin Jansa" Date: Mon, 2 Aug 2021 09:45:55 -0700 Subject: meta-clang: Convert to new override syntax Signed-off-by: Martin Jansa Signed-off-by: Khem Raj --- recipes-devtools/clang/clang-cross-canadian_git.bb | 2 +- recipes-devtools/clang/clang_git.bb | 90 +++++++++++----------- .../clang/compiler-rt-sanitizers_git.bb | 42 +++++----- recipes-devtools/clang/compiler-rt_git.bb | 54 ++++++------- recipes-devtools/clang/libclc_git.bb | 4 +- recipes-devtools/clang/libcxx_git.bb | 38 ++++----- recipes-devtools/clang/nativesdk-clang-glue.bb | 4 +- recipes-devtools/clang/openmp_git.bb | 16 ++-- 8 files changed, 125 insertions(+), 125 deletions(-) (limited to 'recipes-devtools/clang') diff --git a/recipes-devtools/clang/clang-cross-canadian_git.bb b/recipes-devtools/clang/clang-cross-canadian_git.bb index b16dbe1..2e00bd9 100644 --- a/recipes-devtools/clang/clang-cross-canadian_git.bb +++ b/recipes-devtools/clang/clang-cross-canadian_git.bb @@ -27,6 +27,6 @@ do_install() { } SSTATE_SCAN_FILES += "*-clang *-clang++ *-llvm-profdata *-llvm-ar \ *-llvm-ranlib *-llvm-nm *-lld *-ld.lld" -do_install_append() { +do_install:append() { cross_canadian_bindirlinks } diff --git a/recipes-devtools/clang/clang_git.bb b/recipes-devtools/clang/clang_git.bb index e52005b..6642af6 100644 --- a/recipes-devtools/clang/clang_git.bb +++ b/recipes-devtools/clang/clang_git.bb @@ -10,11 +10,11 @@ require common-source.inc INHIBIT_DEFAULT_DEPS = "1" -BUILD_CC_class-nativesdk = "clang" -BUILD_CXX_class-nativesdk = "clang++" -BUILD_AR_class-nativesdk = "llvm-ar" -BUILD_RANLIB_class-nativesdk = "llvm-ranlib" -BUILD_NM_class-nativesdk = "llvm-nm" +BUILD_CC:class-nativesdk = "clang" +BUILD_CXX:class-nativesdk = "clang++" +BUILD_AR:class-nativesdk = "llvm-ar" +BUILD_RANLIB:class-nativesdk = "llvm-ranlib" +BUILD_NM:class-nativesdk = "llvm-nm" inherit cmake cmake-native pkgconfig python3native @@ -55,8 +55,8 @@ PACKAGECONFIG ??= "compiler-rt libcplusplus shared-libs lldb-wchar \ ${@bb.utils.contains('RUNTIME', 'llvm', 'compiler-rt libcplusplus unwindlib libomp', '', d)} \ rtti eh libedit terminfo \ " -PACKAGECONFIG_class-native = "rtti eh libedit shared-libs ${@bb.utils.contains('RUNTIME', 'llvm', 'compiler-rt libcplusplus unwindlib libomp', '', d)}" -PACKAGECONFIG_class-nativesdk = "rtti eh libedit shared-libs ${@bb.utils.filter('DISTRO_FEATURES', 'thin-lto lto', d)} ${@bb.utils.contains('RUNTIME', 'llvm', 'compiler-rt libcplusplus unwindlib libomp', '', d)}" +PACKAGECONFIG:class-native = "rtti eh libedit shared-libs ${@bb.utils.contains('RUNTIME', 'llvm', 'compiler-rt libcplusplus unwindlib libomp', '', d)}" +PACKAGECONFIG:class-nativesdk = "rtti eh libedit shared-libs ${@bb.utils.filter('DISTRO_FEATURES', 'thin-lto lto', d)} ${@bb.utils.contains('RUNTIME', 'llvm', 'compiler-rt libcplusplus unwindlib libomp', '', d)}" PACKAGECONFIG[compiler-rt] = "-DCLANG_DEFAULT_RTLIB=compiler-rt,," PACKAGECONFIG[libcplusplus] = "-DCLANG_DEFAULT_CXX_STDLIB=libc++,," @@ -101,7 +101,7 @@ CLANG_DEFAULT_OPENMP_RUNTIME;\ LLVM_TARGETS_TO_BUILD ?= "AMDGPU;AArch64;ARM;BPF;Mips;PowerPC;RISCV;X86" LLVM_EXPERIMENTAL_TARGETS_TO_BUILD ?= "" -LLVM_EXPERIMENTAL_TARGETS_TO_BUILD_append = ";${@get_clang_experimental_target_arch(bb, d)}" +LLVM_EXPERIMENTAL_TARGETS_TO_BUILD:append = ";${@get_clang_experimental_target_arch(bb, d)}" HF = "${@ bb.utils.contains('TUNE_CCARGS_MFLOAT', 'hard', 'hf', '', d)}" HF[vardepvalue] = "${HF}" @@ -109,10 +109,10 @@ HF[vardepvalue] = "${HF}" LLVM_PROJECTS ?= "clang;clang-tools-extra;lld${LLDB}" LLDB ?= ";lldb" # LLDB support for RISCV/Mips32 does not work yet -LLDB_riscv32 = "" -LLDB_riscv64 = "" -LLDB_mips = "" -LLDB_mipsel = "" +LLDB:riscv32 = "" +LLDB:riscv64 = "" +LLDB:mips = "" +LLDB:mipsel = "" #CMAKE_VERBOSE = "VERBOSE=1" @@ -136,10 +136,10 @@ EXTRA_OECMAKE += "-DLLVM_ENABLE_ASSERTIONS=OFF \ -DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD='${LLVM_EXPERIMENTAL_TARGETS_TO_BUILD}' \ " -EXTRA_OECMAKE_append_class-native = "\ +EXTRA_OECMAKE:append:class-native = "\ -DPYTHON_EXECUTABLE='${PYTHON}' \ " -EXTRA_OECMAKE_append_class-nativesdk = "\ +EXTRA_OECMAKE:append:class-nativesdk = "\ -DCMAKE_CROSSCOMPILING:BOOL=ON \ -DCROSS_TOOLCHAIN_FLAGS_NATIVE='-DLLDB_PYTHON_RELATIVE_PATH=${PYTHON_SITEPACKAGES_DIR} -DCMAKE_TOOLCHAIN_FILE=${WORKDIR}/toolchain-native.cmake' \ -DCMAKE_RANLIB=${STAGING_BINDIR_TOOLCHAIN}/${TARGET_PREFIX}llvm-ranlib \ @@ -154,7 +154,7 @@ EXTRA_OECMAKE_append_class-nativesdk = "\ -DPYTHON_INCLUDE_DIR=${STAGING_INCDIR}/${PYTHON_DIR}${PYTHON_ABI} \ -DPYTHON_EXECUTABLE='${PYTHON}' \ " -EXTRA_OECMAKE_append_class-target = "\ +EXTRA_OECMAKE:append:class-target = "\ -DCMAKE_CROSSCOMPILING:BOOL=ON \ -DCROSS_TOOLCHAIN_FLAGS_NATIVE='-DLLDB_PYTHON_RELATIVE_PATH=${PYTHON_SITEPACKAGES_DIR}' \ -DLLVM_TABLEGEN=${STAGING_BINDIR_NATIVE}/llvm-tblgen \ @@ -175,17 +175,17 @@ EXTRA_OECMAKE_append_class-target = "\ " DEPENDS = "binutils zlib libffi libxml2 libxml2-native ninja-native swig-native" -DEPENDS_append_class-nativesdk = " clang-crosssdk-${SDK_ARCH} virtual/${TARGET_PREFIX}binutils-crosssdk nativesdk-python3" -DEPENDS_append_class-target = " clang-cross-${TARGET_ARCH} python3" +DEPENDS:append:class-nativesdk = " clang-crosssdk-${SDK_ARCH} virtual/${TARGET_PREFIX}binutils-crosssdk nativesdk-python3" +DEPENDS:append:class-target = " clang-cross-${TARGET_ARCH} python3" -RRECOMMENDS_${PN} = "binutils" -RRECOMMENDS_${PN}_append_class-target = " libcxx-dev" +RRECOMMENDS:${PN} = "binutils" +RRECOMMENDS:${PN}:append:class-target = " libcxx-dev" -do_install_append() { +do_install:append() { rm -rf ${D}${libdir}/python*/site-packages/six.py } -do_install_append_class-target () { +do_install:append:class-target () { # Allow bin path to change based on YOCTO_ALTERNATE_EXE_PATH sed -i 's;${_IMPORT_PREFIX}/bin;${_IMPORT_PREFIX_BIN};g' ${D}${libdir}/cmake/llvm/LLVMExports-release.cmake @@ -208,7 +208,7 @@ endif()\n" ${D}${libdir}/cmake/llvm/LLVMExports-release.cmake done } -do_install_append_class-native () { +do_install:append:class-native () { install -Dm 0755 ${B}${BINPATHPREFIX}/bin/clang-tblgen ${D}${bindir}/clang-tblgen install -Dm 0755 ${B}${BINPATHPREFIX}/bin/lldb-tblgen ${D}${bindir}/lldb-tblgen for f in `find ${D}${bindir} -executable -type f -not -type l`; do @@ -220,7 +220,7 @@ do_install_append_class-native () { ln -sf llvm-config ${D}${bindir}/llvm-config${PV} } -do_install_append_class-nativesdk () { +do_install:append:class-nativesdk () { install -Dm 0755 ${B}${BINPATHPREFIX}/bin/clang-tblgen ${D}${bindir}/clang-tblgen install -Dm 0755 ${B}${BINPATHPREFIX}/bin/lldb-tblgen ${D}${bindir}/lldb-tblgen for f in `find ${D}${bindir} -executable -type f -not -type l`; do @@ -236,15 +236,15 @@ do_install_append_class-nativesdk () { PACKAGES =+ "${PN}-libllvm ${PN}-lldb-python libclang lldb lldb-server liblldb" PROVIDES += "llvm llvm${PV}" -PROVIDES_append_class-native = " llvm-native" +PROVIDES:append:class-native = " llvm-native" BBCLASSEXTEND = "native nativesdk" -RDEPENDS_lldb += "${PN}-lldb-python" +RDEPENDS:lldb += "${PN}-lldb-python" -FILES_${PN}-lldb-python = "${libdir}/python*/site-packages/lldb/*" +FILES:${PN}-lldb-python = "${libdir}/python*/site-packages/lldb/*" -FILES_${PN} += "\ +FILES:${PN} += "\ ${libdir}/BugpointPasses.so \ ${libdir}/LLVMHello.so \ ${libdir}/LLVMgold.so \ @@ -256,59 +256,59 @@ FILES_${PN} += "\ ${datadir}/opt-viewer/ \ " -FILES_lldb = "\ +FILES:lldb = "\ ${bindir}/lldb \ " -FILES_lldb-server = "\ +FILES:lldb-server = "\ ${bindir}/lldb-server \ " -FILES_liblldb = "\ +FILES:liblldb = "\ ${libdir}/liblldbIntelFeatures.so* \ ${libdir}/liblldb.so* \ " -FILES_${PN}-libllvm =+ "\ +FILES:${PN}-libllvm =+ "\ ${libdir}/libLLVM-${MAJOR_VER}.${MINOR_VER}.so \ ${libdir}/libLLVM-${MAJOR_VER}.so \ ${libdir}/libLLVM-${MAJOR_VER}git.so \ ${libdir}/libLLVM-${MAJOR_VER}.${MINOR_VER}git.so \ " -FILES_libclang = "\ +FILES:libclang = "\ ${libdir}/libclang.so.${MAJOR_VER} \ " -FILES_${PN}-dev += "\ +FILES:${PN}-dev += "\ ${datadir}/llvm/cmake \ ${libdir}/cmake \ ${nonarch_libdir}/libear \ ${nonarch_libdir}/${BPN}/*.la \ " -FILES_${PN}-staticdev += "${nonarch_libdir}/${BPN}/*.a" +FILES:${PN}-staticdev += "${nonarch_libdir}/${BPN}/*.a" -FILES_${PN}-staticdev_remove = "${libdir}/${BPN}/*.a" -FILES_${PN}-dev_remove = "${libdir}/${BPN}/*.la" -FILES_${PN}_remove = "${libdir}/${BPN}/*" +FILES:${PN}-staticdev:remove = "${libdir}/${BPN}/*.a" +FILES:${PN}-dev:remove = "${libdir}/${BPN}/*.la" +FILES:${PN}:remove = "${libdir}/${BPN}/*" -INSANE_SKIP_${PN} += "already-stripped" +INSANE_SKIP:${PN} += "already-stripped" #INSANE_SKIP_${PN}-dev += "dev-elf" -INSANE_SKIP_${PN}-lldb-python += "dev-so dev-deps" -INSANE_SKIP_liblldb = "dev-so" +INSANE_SKIP:${PN}-lldb-python += "dev-so dev-deps" +INSANE_SKIP:liblldb = "dev-so" #Avoid SSTATE_SCAN_COMMAND running sed over llvm-config. -SSTATE_SCAN_FILES_remove = "*-config" +SSTATE_SCAN_FILES:remove = "*-config" TOOLCHAIN = "clang" -TOOLCHAIN_class-native = "gcc" -TOOLCHAIN_class-nativesdk = "clang" +TOOLCHAIN:class-native = "gcc" +TOOLCHAIN:class-nativesdk = "clang" -SYSROOT_DIRS_append_class-target = " ${nonarch_libdir}" +SYSROOT_DIRS:append:class-target = " ${nonarch_libdir}" -SYSROOT_PREPROCESS_FUNCS_append_class-target = " clang_sysroot_preprocess" +SYSROOT_PREPROCESS_FUNCS:append:class-target = " clang_sysroot_preprocess" clang_sysroot_preprocess() { install -d ${SYSROOT_DESTDIR}${bindir_crossscripts}/ diff --git a/recipes-devtools/clang/compiler-rt-sanitizers_git.bb b/recipes-devtools/clang/compiler-rt-sanitizers_git.bb index 38558d7..42005df 100644 --- a/recipes-devtools/clang/compiler-rt-sanitizers_git.bb +++ b/recipes-devtools/clang/compiler-rt-sanitizers_git.bb @@ -13,11 +13,11 @@ inherit cmake pkgconfig python3native LIC_FILES_CHKSUM = "file://compiler-rt/LICENSE.TXT;md5=d846d1d65baf322d4c485d6ee54e877a" -TUNE_CCARGS_remove = "-no-integrated-as" +TUNE_CCARGS:remove = "-no-integrated-as" DEPENDS += "ninja-native virtual/crypt" -DEPENDS_append_class-native = " clang-native libxcrypt-native" -DEPENDS_append_class-nativesdk = " clang-native nativesdk-libxcrypt" +DEPENDS:append:class-native = " clang-native libxcrypt-native" +DEPENDS:append:class-nativesdk = " clang-native nativesdk-libxcrypt" PACKAGECONFIG ??= "" PACKAGECONFIG[crt] = "-DCOMPILER_RT_BUILD_CRT:BOOL=ON,-DCOMPILER_RT_BUILD_CRT:BOOL=OFF" @@ -45,15 +45,15 @@ EXTRA_OECMAKE += "-DCOMPILER_RT_STANDALONE_BUILD=OFF \ -DLLVM_LIBDIR_SUFFIX=${LLVM_LIBDIR_SUFFIX} \ " -EXTRA_OECMAKE_append_class-nativesdk = "\ +EXTRA_OECMAKE:append:class-nativesdk = "\ -DLLVM_TABLEGEN=${STAGING_BINDIR_NATIVE}/llvm-tblgen \ -DCLANG_TABLEGEN=${STAGING_BINDIR_NATIVE}/clang-tblgen \ " -EXTRA_OECMAKE_append_libc-musl = " -DLIBCXX_HAS_MUSL_LIBC=ON " -EXTRA_OECMAKE_append_powerpc = " -DCOMPILER_RT_DEFAULT_TARGET_ARCH=powerpc " +EXTRA_OECMAKE:append:libc-musl = " -DLIBCXX_HAS_MUSL_LIBC=ON " +EXTRA_OECMAKE:append:powerpc = " -DCOMPILER_RT_DEFAULT_TARGET_ARCH=powerpc " -do_install_append () { +do_install:append () { if [ -n "${LLVM_LIBDIR_SUFFIX}" ]; then mkdir -p ${D}${nonarch_libdir} mv ${D}${libdir}/clang ${D}${nonarch_libdir}/clang @@ -64,17 +64,17 @@ do_install_append () { } FILES_SOLIBSDEV = "" -FILES_${PN} += "${nonarch_libdir}/clang/${MAJOR_VER}.${MINOR_VER}.${PATCH_VER}/lib/linux/lib*${SOLIBSDEV} \ +FILES:${PN} += "${nonarch_libdir}/clang/${MAJOR_VER}.${MINOR_VER}.${PATCH_VER}/lib/linux/lib*${SOLIBSDEV} \ ${nonarch_libdir}/clang/${MAJOR_VER}.${MINOR_VER}.${PATCH_VER}/*.txt \ ${nonarch_libdir}/clang/${MAJOR_VER}.${MINOR_VER}.${PATCH_VER}/share/*.txt" -FILES_${PN}-staticdev += "${nonarch_libdir}/clang/${MAJOR_VER}.${MINOR_VER}.${PATCH_VER}/lib/linux/*.a" -FILES_${PN}-dev += "${datadir} ${nonarch_libdir}/clang/${MAJOR_VER}.${MINOR_VER}.${PATCH_VER}/lib/linux/*.syms \ +FILES:${PN}-staticdev += "${nonarch_libdir}/clang/${MAJOR_VER}.${MINOR_VER}.${PATCH_VER}/lib/linux/*.a" +FILES:${PN}-dev += "${datadir} ${nonarch_libdir}/clang/${MAJOR_VER}.${MINOR_VER}.${PATCH_VER}/lib/linux/*.syms \ ${nonarch_libdir}/clang/${MAJOR_VER}.${MINOR_VER}.${PATCH_VER}/include \ ${nonarch_libdir}/clang/${MAJOR_VER}.${MINOR_VER}.${PATCH_VER}/lib/linux/clang_rt.crt*.o \ ${nonarch_libdir}/clang/${MAJOR_VER}.${MINOR_VER}.${PATCH_VER}/lib/linux/libclang_rt.asan-preinit*.a \ " -INSANE_SKIP_${PN} = "dev-so libdir" -INSANE_SKIP_${PN}-dbg = "libdir" +INSANE_SKIP:${PN} = "dev-so libdir" +INSANE_SKIP:${PN}-dbg = "libdir" #PROVIDES_append_class-target = "\ # virtual/${TARGET_PREFIX}compilerlibs \ @@ -85,18 +85,18 @@ INSANE_SKIP_${PN}-dbg = "libdir" # " # -RDEPENDS_${PN}-dev += "${PN}-staticdev" +RDEPENDS:${PN}-dev += "${PN}-staticdev" BBCLASSEXTEND = "native nativesdk" -ALLOW_EMPTY_${PN} = "1" -ALLOW_EMPTY_${PN}-dev = "1" +ALLOW_EMPTY:${PN} = "1" +ALLOW_EMPTY:${PN}-dev = "1" -TOOLCHAIN_forcevariable = "clang" -SYSROOT_DIRS_append_class-target = " ${nonarch_libdir}" +TOOLCHAIN:forcevariable = "clang" +SYSROOT_DIRS:append:class-target = " ${nonarch_libdir}" # riscv and x86_64 Sanitizers work on musl too -COMPATIBLE_HOST_libc-musl_x86-64 = "(.*)" -COMPATIBLE_HOST_libc-musl_riscv64 = "(.*)" -COMPATIBLE_HOST_libc-musl_riscv32 = "(.*)" -COMPATIBLE_HOST_libc-musl = "null" +COMPATIBLE_HOST:libc-musl:x86-64 = "(.*)" +COMPATIBLE_HOST:libc-musl:riscv64 = "(.*)" +COMPATIBLE_HOST:libc-musl:riscv32 = "(.*)" +COMPATIBLE_HOST:libc-musl = "null" diff --git a/recipes-devtools/clang/compiler-rt_git.bb b/recipes-devtools/clang/compiler-rt_git.bb index 8a595d1..607bbc9 100644 --- a/recipes-devtools/clang/compiler-rt_git.bb +++ b/recipes-devtools/clang/compiler-rt_git.bb @@ -16,29 +16,29 @@ LIC_FILES_CHKSUM = "file://compiler-rt/LICENSE.TXT;md5=d846d1d65baf322d4c485d6ee LIBCPLUSPLUS = "" COMPILER_RT = "" -TUNE_CCARGS_remove = "-no-integrated-as" +TUNE_CCARGS:remove = "-no-integrated-as" INHIBIT_DEFAULT_DEPS = "1" DEPENDS += "ninja-native libgcc" -DEPENDS_append_class-target = " clang-cross-${TARGET_ARCH} virtual/${MLPREFIX}libc gcc-runtime" -DEPENDS_append_class-nativesdk = " clang-native" -DEPENDS_append_class-native = " clang-native" +DEPENDS:append:class-target = " clang-cross-${TARGET_ARCH} virtual/${MLPREFIX}libc gcc-runtime" +DEPENDS:append:class-nativesdk = " clang-native" +DEPENDS:append:class-native = " clang-native" CXXFLAGS += "-stdlib=libstdc++" LDFLAGS += "-unwindlib=libgcc -rtlib=libgcc -stdlib=libstdc++" BUILD_CXXFLAGS += "-stdlib=libstdc++" BUILD_LDFLAGS += "-unwindlib=libgcc -rtlib=libgcc -stdlib=libstdc++" -BUILD_CPPFLAGS_remove = "-stdlib=libc++" -BUILD_LDFLAGS_remove = "-stdlib=libc++ -lc++abi" +BUILD_CPPFLAGS:remove = "-stdlib=libc++" +BUILD_LDFLAGS:remove = "-stdlib=libc++ -lc++abi" -BUILD_CC_toolchain-clang = "${CCACHE}clang" -BUILD_CXX_toolchain-clang = "${CCACHE}clang++" -BUILD_CPP_toolchain-clang = "${CCACHE}clang -E" -BUILD_CCLD_toolchain-clang = "${CCACHE}clang" -BUILD_RANLIB_toolchain-clang = "llvm-ranlib" -BUILD_AR_toolchain-clang = "llvm-ar" -BUILD_NM_toolchain-clang = "llvm-nm" +BUILD_CC:toolchain-clang = "${CCACHE}clang" +BUILD_CXX:toolchain-clang = "${CCACHE}clang++" +BUILD_CPP:toolchain-clang = "${CCACHE}clang -E" +BUILD_CCLD:toolchain-clang = "${CCACHE}clang" +BUILD_RANLIB:toolchain-clang = "llvm-ranlib" +BUILD_AR:toolchain-clang = "llvm-ar" +BUILD_NM:toolchain-clang = "llvm-nm" PACKAGECONFIG ??= "" PACKAGECONFIG[crt] = "-DCOMPILER_RT_BUILD_CRT:BOOL=ON,-DCOMPILER_RT_BUILD_CRT:BOOL=OFF" @@ -59,22 +59,22 @@ EXTRA_OECMAKE += "-DCOMPILER_RT_STANDALONE_BUILD=OFF \ -DLLVM_ENABLE_PROJECTS='compiler-rt' \ -DLLVM_LIBDIR_SUFFIX=${LLVM_LIBDIR_SUFFIX} \ " -EXTRA_OECMAKE_append_class-target = "\ +EXTRA_OECMAKE:append:class-target = "\ -DCMAKE_RANLIB=${STAGING_BINDIR_TOOLCHAIN}/${TARGET_PREFIX}llvm-ranlib \ -DCMAKE_AR=${STAGING_BINDIR_TOOLCHAIN}/${TARGET_PREFIX}llvm-ar \ -DCMAKE_NM=${STAGING_BINDIR_TOOLCHAIN}/${TARGET_PREFIX}llvm-nm \ " -EXTRA_OECMAKE_append_class-nativesdk = "\ +EXTRA_OECMAKE:append:class-nativesdk = "\ -DCMAKE_RANLIB=${STAGING_BINDIR_TOOLCHAIN}/${TARGET_PREFIX}llvm-ranlib \ -DCMAKE_AR=${STAGING_BINDIR_TOOLCHAIN}/${TARGET_PREFIX}llvm-ar \ -DCMAKE_NM=${STAGING_BINDIR_TOOLCHAIN}/${TARGET_PREFIX}llvm-nm \ -DLLVM_TABLEGEN=${STAGING_BINDIR_NATIVE}/llvm-tblgen \ -DCLANG_TABLEGEN=${STAGING_BINDIR_NATIVE}/clang-tblgen \ " -EXTRA_OECMAKE_append_powerpc = " -DCOMPILER_RT_DEFAULT_TARGET_ARCH=powerpc " +EXTRA_OECMAKE:append:powerpc = " -DCOMPILER_RT_DEFAULT_TARGET_ARCH=powerpc " -do_install_append () { +do_install:append () { if [ -n "${LLVM_LIBDIR_SUFFIX}" ]; then mkdir -p ${D}${nonarch_libdir} mv ${D}${libdir}/clang ${D}${nonarch_libdir}/clang @@ -83,17 +83,17 @@ do_install_append () { } FILES_SOLIBSDEV = "" -FILES_${PN} += "${nonarch_libdir}/clang/${MAJOR_VER}.${MINOR_VER}.${PATCH_VER}/lib/linux/lib*${SOLIBSDEV} \ +FILES:${PN} += "${nonarch_libdir}/clang/${MAJOR_VER}.${MINOR_VER}.${PATCH_VER}/lib/linux/lib*${SOLIBSDEV} \ ${nonarch_libdir}/clang/${MAJOR_VER}.${MINOR_VER}.${PATCH_VER}/*.txt \ ${nonarch_libdir}/clang/${MAJOR_VER}.${MINOR_VER}.${PATCH_VER}/share/*.txt" -FILES_${PN}-staticdev += "${nonarch_libdir}/clang/${MAJOR_VER}.${MINOR_VER}.${PATCH_VER}/lib/linux/*.a" -FILES_${PN}-dev += "${datadir} ${nonarch_libdir}/clang/${MAJOR_VER}.${MINOR_VER}.${PATCH_VER}/lib/linux/*.syms \ +FILES:${PN}-staticdev += "${nonarch_libdir}/clang/${MAJOR_VER}.${MINOR_VER}.${PATCH_VER}/lib/linux/*.a" +FILES:${PN}-dev += "${datadir} ${nonarch_libdir}/clang/${MAJOR_VER}.${MINOR_VER}.${PATCH_VER}/lib/linux/*.syms \ ${nonarch_libdir}/clang/${MAJOR_VER}.${MINOR_VER}.${PATCH_VER}/include \ ${nonarch_libdir}/clang/${MAJOR_VER}.${MINOR_VER}.${PATCH_VER}/lib/linux/clang_rt.crt*.o \ ${nonarch_libdir}/clang/${MAJOR_VER}.${MINOR_VER}.${PATCH_VER}/lib/linux/libclang_rt.asan-preinit*.a \ " -INSANE_SKIP_${PN} = "dev-so libdir" -INSANE_SKIP_${PN}-dbg = "libdir" +INSANE_SKIP:${PN} = "dev-so libdir" +INSANE_SKIP:${PN}-dbg = "libdir" #PROVIDES_append_class-target = "\ # virtual/${TARGET_PREFIX}compilerlibs \ @@ -104,12 +104,12 @@ INSANE_SKIP_${PN}-dbg = "libdir" # " # -RDEPENDS_${PN}-dev += "${PN}-staticdev" +RDEPENDS:${PN}-dev += "${PN}-staticdev" BBCLASSEXTEND = "native nativesdk" -ALLOW_EMPTY_${PN} = "1" -ALLOW_EMPTY_${PN}-dev = "1" +ALLOW_EMPTY:${PN} = "1" +ALLOW_EMPTY:${PN}-dev = "1" -TOOLCHAIN_forcevariable = "clang" -SYSROOT_DIRS_append_class-target = " ${nonarch_libdir}" +TOOLCHAIN:forcevariable = "clang" +SYSROOT_DIRS:append:class-target = " ${nonarch_libdir}" diff --git a/recipes-devtools/clang/libclc_git.bb b/recipes-devtools/clang/libclc_git.bb index 9525b25..3cc52b5 100644 --- a/recipes-devtools/clang/libclc_git.bb +++ b/recipes-devtools/clang/libclc_git.bb @@ -21,7 +21,7 @@ EXTRA_OECMAKE += " \ -Dll_comp_in:FILEPATH=${OECMAKE_SOURCEPATH}/cmake/CMakeLLAsmCompiler.cmake.in \ " -do_configure_prepend () { +do_configure:prepend () { # Write out a qemu wrapper that will be used by cmake # so that it can run target helper binaries through that. qemu_binary="${@qemu_wrapper_cmdline(d, d.getVar('STAGING_DIR_HOST'), [d.expand('${STAGING_DIR_HOST}${libdir}'),d.expand('${STAGING_DIR_HOST}${base_libdir}')])}" @@ -32,6 +32,6 @@ EOF chmod +x ${WORKDIR}/qemuwrapper } -FILES_${PN} += "${datadir}/clc" +FILES:${PN} += "${datadir}/clc" BBCLASSEXTEND = "native nativesdk" 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 inherit cmake cmake-native python3native PACKAGECONFIG ??= "compiler-rt exceptions ${@bb.utils.contains("RUNTIME", "llvm", "unwind unwind-shared", "", d)}" -PACKAGECONFIG_append_armv5 = " no-atomics" -PACKAGECONFIG_remove_class-native = "compiler-rt" +PACKAGECONFIG:append:armv5 = " no-atomics" +PACKAGECONFIG:remove:class-native = "compiler-rt" PACKAGECONFIG[unwind] = "-DLIBCXXABI_USE_LLVM_UNWINDER=ON -DLIBCXXABI_ENABLE_STATIC_UNWINDER=ON,-DLIBCXXABI_USE_LLVM_UNWINDER=OFF,," PACKAGECONFIG[exceptions] = "-DLIBCXXABI_ENABLE_EXCEPTIONS=ON -DDLIBCXX_ENABLE_EXCEPTIONS=ON,-DLIBCXXABI_ENABLE_EXCEPTIONS=OFF -DLIBCXX_ENABLE_EXCEPTIONS=OFF -DCMAKE_REQUIRED_FLAGS='-fno-exceptions'," 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 PACKAGECONFIG[unwind-shared] = "-DLIBUNWIND_ENABLE_SHARED=ON,-DLIBUNWIND_ENABLE_SHARED=OFF,," DEPENDS += "ninja-native" -DEPENDS_append_class-target = " clang-cross-${TARGET_ARCH} virtual/${MLPREFIX}libc virtual/${TARGET_PREFIX}compilerlibs" -DEPENDS_append_class-native = " clang-native" +DEPENDS:append:class-target = " clang-cross-${TARGET_ARCH} virtual/${MLPREFIX}libc virtual/${TARGET_PREFIX}compilerlibs" +DEPENDS:append:class-native = " clang-native" LIBCPLUSPLUS = "" COMPILER_RT ?= "-rtlib=compiler-rt" -CC_append_toolchain-clang_class-native = " -unwindlib=libgcc -rtlib=libgcc" +CC:append:toolchain-clang:class-native = " -unwindlib=libgcc -rtlib=libgcc" CXXFLAGS += "-stdlib=libstdc++" LDFLAGS += "-unwindlib=libgcc -stdlib=libstdc++" BUILD_CXXFLAGS += "-stdlib=libstdc++" BUILD_LDFLAGS += "-unwindlib=libgcc -rtlib=libgcc -stdlib=libstdc++" -BUILD_CPPFLAGS_remove = "-stdlib=libc++" -BUILD_LDFLAGS_remove = "-stdlib=libc++ -lc++abi" +BUILD_CPPFLAGS:remove = "-stdlib=libc++" +BUILD_LDFLAGS:remove = "-stdlib=libc++ -lc++abi" INHIBIT_DEFAULT_DEPS = "1" @@ -42,7 +42,7 @@ LIC_FILES_CHKSUM = "file://libcxx/LICENSE.TXT;md5=55d89dd7eec8d3b4204b680e27da39 file://libunwind/LICENSE.TXT;md5=f66970035d12f196030658b11725e1a1 \ " -LLVM_LIBDIR_SUFFIX_powerpc64 = "64" +LLVM_LIBDIR_SUFFIX:powerpc64 = "64" OECMAKE_TARGET_COMPILE = "cxxabi cxx" OECMAKE_TARGET_INSTALL = "install-cxx install-cxxabi ${@bb.utils.contains("RUNTIME", "llvm", "install-unwind", "", d)}" @@ -63,31 +63,31 @@ EXTRA_OECMAKE += "\ -DLLVM_LIBDIR_SUFFIX=${LLVM_LIBDIR_SUFFIX} \ " -EXTRA_OECMAKE_append_class-target = " \ +EXTRA_OECMAKE:append:class-target = " \ -DCMAKE_AR=${STAGING_BINDIR_TOOLCHAIN}/${AR} \ -DCMAKE_NM=${STAGING_BINDIR_TOOLCHAIN}/${NM} \ -DCMAKE_RANLIB=${STAGING_BINDIR_TOOLCHAIN}/${RANLIB} \ -DLLVM_DEFAULT_TARGET_TRIPLE=${HOST_SYS} \ " -EXTRA_OECMAKE_append_class-native = " -DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF \ +EXTRA_OECMAKE:append:class-native = " -DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF \ " -EXTRA_OECMAKE_append_class-nativesdk = " -DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF \ +EXTRA_OECMAKE:append:class-nativesdk = " -DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF \ -DCMAKE_AR=${STAGING_BINDIR_TOOLCHAIN}/${AR} \ -DCMAKE_NM=${STAGING_BINDIR_TOOLCHAIN}/${NM} \ -DCMAKE_RANLIB=${STAGING_BINDIR_TOOLCHAIN}/${RANLIB} \ -DLLVM_DEFAULT_TARGET_TRIPLE=${HOST_SYS} \ " -EXTRA_OECMAKE_append_libc-musl = " -DLIBCXX_HAS_MUSL_LIBC=ON " +EXTRA_OECMAKE:append:libc-musl = " -DLIBCXX_HAS_MUSL_LIBC=ON " -CXXFLAGS_append_armv5 = " -mfpu=vfp2" +CXXFLAGS:append:armv5 = " -mfpu=vfp2" -ALLOW_EMPTY_${PN} = "1" +ALLOW_EMPTY:${PN} = "1" -PROVIDES_append_runtime-llvm = " libunwind" +PROVIDES:append_runtime-llvm = " libunwind" -do_install_append() { +do_install:append() { if ${@bb.utils.contains("RUNTIME", "llvm", "true", "false", d)} then install -Dm 0644 ${S}/libunwind/include/libunwind.h ${S}/libunwind/include/__libunwind_config.h ${D}${includedir} @@ -97,8 +97,8 @@ do_install_append() { fi } -PACKAGES_append_runtime-llvm = " libunwind" -FILES_libunwind_runtime-llvm = "${libdir}/libunwind.so.*" +PACKAGES:append_runtime-llvm = " libunwind" +FILES:libunwind_runtime-llvm = "${libdir}/libunwind.so.*" BBCLASSEXTEND = "native nativesdk" -TOOLCHAIN_forcevariable = "clang" +TOOLCHAIN:forcevariable = "clang" diff --git a/recipes-devtools/clang/nativesdk-clang-glue.bb b/recipes-devtools/clang/nativesdk-clang-glue.bb index 169366a..f1f34d5 100644 --- a/recipes-devtools/clang/nativesdk-clang-glue.bb +++ b/recipes-devtools/clang/nativesdk-clang-glue.bb @@ -23,8 +23,8 @@ sysroot_stage_all () { sysroot_stage_dir ${D} ${SYSROOT_DESTDIR} } -FILES_${PN} += "${prefix_nativesdk} ${base_libdir_nativesdk}" -FILES_${PN}-dbg = "" +FILES:${PN} += "${prefix_nativesdk} ${base_libdir_nativesdk}" +FILES:${PN}-dbg = "" deltask do_configure deltask do_compile diff --git a/recipes-devtools/clang/openmp_git.bb b/recipes-devtools/clang/openmp_git.bb index 95b3a9e..7ce89eb 100644 --- a/recipes-devtools/clang/openmp_git.bb +++ b/recipes-devtools/clang/openmp_git.bb @@ -27,9 +27,9 @@ OECMAKE_SOURCEPATH = "${S}/openmp" PACKAGECONFIG ?= "ompt-tools offloading-plugin" -PACKAGECONFIG_remove_arm = "ompt-tools offloading-plugin" -PACKAGECONFIG_remove_mipsarch = "ompt-tools offloading-plugin" -PACKAGECONFIG_remove_powerpc = "ompt-tools offloading-plugin" +PACKAGECONFIG:remove:arm = "ompt-tools offloading-plugin" +PACKAGECONFIG:remove:mipsarch = "ompt-tools offloading-plugin" +PACKAGECONFIG:remove:powerpc = "ompt-tools offloading-plugin" PACKAGECONFIG[ompt-tools] = "-DOPENMP_ENABLE_OMPT_TOOLS=ON,-DOPENMP_ENABLE_OMPT_TOOLS=OFF," PACKAGECONFIG[aliases] = "-DLIBOMP_INSTALL_ALIASES=ON,-DLIBOMP_INSTALL_ALIASES=OFF," @@ -37,11 +37,11 @@ PACKAGECONFIG[offloading-plugin] = ",,elfutils libffi,libelf libffi" PACKAGES += "${PN}-libomptarget-amdgcn" FILES_SOLIBSDEV = "" -FILES_${PN} += "${libdir}/lib*${SOLIBSDEV}" -FILES_${PN}-libomptarget-amdgcn = "${libdir}/libomptarget-amdgcn-*.bc" -INSANE_SKIP_${PN} = "dev-so" +FILES:${PN} += "${libdir}/lib*${SOLIBSDEV}" +FILES:${PN}-libomptarget-amdgcn = "${libdir}/libomptarget-amdgcn-*.bc" +INSANE_SKIP:${PN} = "dev-so" -COMPATIBLE_HOST_mips64 = "null" -COMPATIBLE_HOST_riscv32 = "null" +COMPATIBLE_HOST:mips64 = "null" +COMPATIBLE_HOST:riscv32 = "null" BBCLASSEXTEND = "native nativesdk" -- cgit v1.2.3-54-g00ecf