From 8e255e8e01e061b57677970a21877d6021fe6310 Mon Sep 17 00:00:00 2001 From: Philip Lorenz Date: Mon, 12 Feb 2024 12:08:04 +0100 Subject: 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 bc72861..7a9b4ef 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/ } -- cgit v1.2.3-54-g00ecf