From 92aac87a620a35191bdc47855273278f041db9ec Mon Sep 17 00:00:00 2001 From: Philip Lorenz Date: Mon, 12 Feb 2024 12:08:04 +0100 Subject: [PATCH 1/2] compiler-rt-sanitizers: Adapt to new liborc filename The library is now named liborc which leads to conflicts when installing compiler-rt and compiler-rt-sanitizers in parallel. Installing compiler-rt-sanitizers-staticdev (17.0.6) on root * check_data_file_clashes: Package compiler-rt-sanitizers-staticdev wants to install file .../usr/lib/clang/17.0.6/lib/linux/liborc_rt-x86_64.a But that file is already provided by package * compiler-rt-staticdev Signed-off-by: Philip Lorenz --- recipes-devtools/clang/compiler-rt-sanitizers_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-devtools/clang/compiler-rt-sanitizers_git.bb b/recipes-devtools/clang/compiler-rt-sanitizers_git.bb index bc72861f..7a9b4ef1 100644 --- a/recipes-devtools/clang/compiler-rt-sanitizers_git.bb +++ b/recipes-devtools/clang/compiler-rt-sanitizers_git.bb @@ -74,7 +74,7 @@ do_install:append () { mv ${D}${libdir}/clang/${MAJOR_VER} ${D}${libdir}/clang/${MAJOR_VER}.${MINOR_VER}.${PATCH_VER} fi # Already shipped with compile-rt Orc support - rm -rf ${D}${nonarch_libdir}/clang/${MAJOR_VER}.${MINOR_VER}.${PATCH_VER}/lib/linux/libclang_rt.orc-*.a + rm -rf ${D}${nonarch_libdir}/clang/${MAJOR_VER}.${MINOR_VER}.${PATCH_VER}/lib/linux/liborc_rt-*.a rm -rf ${D}${nonarch_libdir}/clang/${MAJOR_VER}.${MINOR_VER}.${PATCH_VER}/include/orc/ } From bf2430b4d4f0459148e4fe44d54e58c41b2c2fd5 Mon Sep 17 00:00:00 2001 From: Philip Lorenz Date: Mon, 12 Feb 2024 12:08:08 +0100 Subject: [PATCH 2/2] compiler-rt-sanitizers: Depend on compiler-rt When configuring with COMPILER_RT_USE_BUILTINS_LIBRARY=ON, compiler-rt expects the target builtin libraries to be available. Make sure that this really is the case by adding them to DEPENDS. Without the dependency recipe build fails during the configure task | -- Failed to find compiler-rt builtins library for x86_64-poky-linux | CMake Error at .../build/tmp/work-shared/llvm-project-source-17.0.6-r0/git/compiler-rt/cmake/Modules/AddCompilerRT.cmake:281 (message): | Cannot find builtins library for the target architecture | Call Stack (most recent call first): | .../build/tmp/work-shared/llvm-project-source-17.0.6-r0/git/compiler-rt/lib/stats/CMakeLists.txt:23 (add_compiler_rt_runtime) Signed-off-by: Philip Lorenz --- recipes-devtools/clang/compiler-rt-sanitizers_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-devtools/clang/compiler-rt-sanitizers_git.bb b/recipes-devtools/clang/compiler-rt-sanitizers_git.bb index 7a9b4ef1..06c0e06f 100644 --- a/recipes-devtools/clang/compiler-rt-sanitizers_git.bb +++ b/recipes-devtools/clang/compiler-rt-sanitizers_git.bb @@ -15,7 +15,7 @@ LIC_FILES_CHKSUM = "file://compiler-rt/LICENSE.TXT;md5=d846d1d65baf322d4c485d6ee TUNE_CCARGS:remove = "-no-integrated-as" -DEPENDS += "ninja-native virtual/crypt" +DEPENDS += "ninja-native virtual/crypt compiler-rt" DEPENDS:append:class-native = " clang-native libxcrypt-native" DEPENDS:append:class-nativesdk = " clang-native clang-crosssdk-${SDK_ARCH} nativesdk-libxcrypt"