diff options
author | Philip Lorenz <philip.lorenz@bmw.de> | 2024-02-12 12:08:04 +0100 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2024-02-14 13:28:14 -0800 |
commit | 8e255e8e01e061b57677970a21877d6021fe6310 (patch) | |
tree | 77ec774318238c19276f76e5750b70f01c772d92 | |
parent | d24a847163343268e51310a0f03dcd0b7046616e (diff) | |
download | meta-clang-8e255e8e01e061b57677970a21877d6021fe6310.tar.gz |
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 <philip.lorenz@bmw.de>
-rw-r--r-- | recipes-devtools/clang/compiler-rt-sanitizers_git.bb | 2 |
1 files changed, 1 insertions, 1 deletions
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 () { | |||
74 | mv ${D}${libdir}/clang/${MAJOR_VER} ${D}${libdir}/clang/${MAJOR_VER}.${MINOR_VER}.${PATCH_VER} | 74 | mv ${D}${libdir}/clang/${MAJOR_VER} ${D}${libdir}/clang/${MAJOR_VER}.${MINOR_VER}.${PATCH_VER} |
75 | fi | 75 | fi |
76 | # Already shipped with compile-rt Orc support | 76 | # Already shipped with compile-rt Orc support |
77 | rm -rf ${D}${nonarch_libdir}/clang/${MAJOR_VER}.${MINOR_VER}.${PATCH_VER}/lib/linux/libclang_rt.orc-*.a | 77 | rm -rf ${D}${nonarch_libdir}/clang/${MAJOR_VER}.${MINOR_VER}.${PATCH_VER}/lib/linux/liborc_rt-*.a |
78 | rm -rf ${D}${nonarch_libdir}/clang/${MAJOR_VER}.${MINOR_VER}.${PATCH_VER}/include/orc/ | 78 | rm -rf ${D}${nonarch_libdir}/clang/${MAJOR_VER}.${MINOR_VER}.${PATCH_VER}/include/orc/ |
79 | } | 79 | } |
80 | 80 | ||