diff --git a/dynamic-layers/meta-clang/clang/0026-libclang-Use-CMAKE_DL_LIBS-for-deducing-libdl.patch b/dynamic-layers/meta-clang/clang/0026-libclang-Use-CMAKE_DL_LIBS-for-deducing-libdl.patch deleted file mode 100644 index 18008c39da..0000000000 --- a/dynamic-layers/meta-clang/clang/0026-libclang-Use-CMAKE_DL_LIBS-for-deducing-libdl.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 9c37e644d96de108d931a6bcce1819a666ae91d8 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Wed, 11 Dec 2019 10:23:15 -0800 -Subject: [PATCH] libclang: Use CMAKE_DL_LIBS for deducing libdl - -This helps in getting right settings for libdl irrespective of platform -it also fixes build with -DLLVM_BUILD_LLVM_DYLIB=ON -DLLVM_LINK_LLVM_DYLIB=ON - -Fixes - -tools/clang/tools/libclang/CMakeFiles/libclang.dir/CIndexer.cpp.o: In function clang::CIndexer::getClangResourcesPath[abi:cxx11]()': 2019-12-06T06:04:39.2987601Z | CIndexer.cpp:(.text._ZN5clang8CIndexer21getClangResourcesPathB5cxx11Ev+0x8b): undefined reference to dladdr' - -Signed-off-by: Khem Raj ---- - clang/tools/libclang/CMakeLists.txt | 5 ++--- - 1 file changed, 2 insertions(+), 3 deletions(-) - -diff --git a/clang/tools/libclang/CMakeLists.txt b/clang/tools/libclang/CMakeLists.txt -index 613ead1a36b..9d5cd0ba9df 100644 ---- a/clang/tools/libclang/CMakeLists.txt -+++ b/clang/tools/libclang/CMakeLists.txt -@@ -58,9 +58,8 @@ if (TARGET clangTidyPlugin) - endif() - endif () - --find_library(DL_LIBRARY_PATH dl) --if (DL_LIBRARY_PATH) -- list(APPEND LIBS dl) -+if (HAVE_LIBDL) -+ list(APPEND LIBS ${CMAKE_DL_LIBS}) - endif() - - option(LIBCLANG_BUILD_STATIC diff --git a/dynamic-layers/meta-clang/clang_%.bbappend b/dynamic-layers/meta-clang/clang_%.bbappend index 274b9d42bf..06eab96802 100644 --- a/dynamic-layers/meta-clang/clang_%.bbappend +++ b/dynamic-layers/meta-clang/clang_%.bbappend @@ -1,9 +1 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:" - -python __anonymous() { - _patch = "file://0026-libclang-Use-CMAKE_DL_LIBS-for-deducing-libdl.patch" - if _patch not in d.getVar("SRC_URI").split(" "): - d.appendVar("SRC_URI", " " + _patch) -} - PACKAGECONFIG_class-native += "shared-libs"