From 345fe436e8dfdc3527791ca262fa2e77855edda1 Mon Sep 17 00:00:00 2001
From: Jeremy Drake <github@jdrake.com>
Date: Sun, 31 Oct 2021 11:30:48 -0700
Subject: [PATCH] clang: move clang-check back to clang package.

and clang-extdef-mapping.

I had moved them to clang-analyzer but clang's cmake files reference
them, and require them to be present if building a cmake project that
uses clang.

Remove makedepends on clang-analyzer from lldb which was added just for
that cmake requirement.
---
 mingw-w64-clang/PKGBUILD | 4 ++--
 mingw-w64-lldb/PKGBUILD  | 3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/mingw-w64-clang/PKGBUILD b/mingw-w64-clang/PKGBUILD
index f895504318b39..c913e40bcbdb3 100644
--- a/mingw-w64-clang/PKGBUILD
+++ b/mingw-w64-clang/PKGBUILD
@@ -250,7 +250,7 @@ build() {
   # -i.orig to check what has been removed in-case it starts dropping more than it should
   #
   sed -i.orig '/\(clang\|lld\)\/cmake_install.cmake/d' tools/cmake_install.cmake
-  sed -i.orig '/\(clang-check\|clang-extdef-mapping\|extra\|scan-build\|scan-build-py\|scan-view\)\/cmake_install.cmake/d' tools/clang/tools/cmake_install.cmake
+  sed -i.orig '/\(extra\|scan-build\|scan-build-py\|scan-view\)\/cmake_install.cmake/d' tools/clang/tools/cmake_install.cmake
   sed -i.orig '/compiler-rt\/cmake_install.cmake/d' projects/cmake_install.cmake
 }
 
@@ -287,7 +287,7 @@ package_clang-analyzer() {
            "${MINGW_PACKAGE_PREFIX}-python")
 
   local _analyzer
-  for _analyzer in clang-check clang-extdef-mapping scan-build scan-build-py scan-view; do
+  for _analyzer in scan-build scan-build-py scan-view; do
     DESTDIR="${pkgdir}" cmake --install "${srcdir}/build-${MSYSTEM}/tools/clang/tools/${_analyzer}"
   done
 
diff --git a/mingw-w64-lldb/PKGBUILD b/mingw-w64-lldb/PKGBUILD
index e1d7b15bbadd7..ba4e4a8acf063 100644
--- a/mingw-w64-lldb/PKGBUILD
+++ b/mingw-w64-lldb/PKGBUILD
@@ -25,8 +25,7 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cmake"
              "${MINGW_PACKAGE_PREFIX}-ninja"
              "${MINGW_PACKAGE_PREFIX}-python-sphinx"
              "${MINGW_PACKAGE_PREFIX}-swig"
-             "${MINGW_PACKAGE_PREFIX}-clang-tools-extra"
-             "${MINGW_PACKAGE_PREFIX}-clang-analyzer")
+             "${MINGW_PACKAGE_PREFIX}-clang-tools-extra")
 options=('!debug' 'strip')
 _url=https://github.com/llvm/llvm-project/releases/download/llvmorg-${pkgver}
 _pkgfn=$_realname-$pkgver.src