[pkgsrc/trunk]: pkgsrc/lang clang: de-lint, repair broken patch distinfo, res...

[tnn <tnn%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/19a3865b82e3
branches:  trunk
changeset: 383150:19a3865b82e3
user:      tnn <tnn%pkgsrc.org@localhost>
date:      Sat Aug 13 09:58:03 2022 +0000

description:
clang: de-lint, repair broken patch distinfo, restore SunOS patch. Untested

diffstat:

 lang/clang-tools-extra/Makefile                            |  12 +++++-----
 lang/clang/Makefile                                        |   4 +-
 lang/clang/Makefile.common                                 |  14 ++++++------
 lang/clang/distinfo                                        |   3 +-
 lang/clang/patches/patch-lib_Frontend_InitHeaderSearch.cpp |  14 -------------
 lang/clang/patches/patch-lib_Lex_InitHeaderSearch.cpp      |  15 ++++++++++++++
 6 files changed, 32 insertions(+), 30 deletions(-)

diffs (154 lines):

diff -r 659c1d138791 -r 19a3865b82e3 lang/clang-tools-extra/Makefile
--- a/lang/clang-tools-extra/Makefile   Sat Aug 13 09:56:45 2022 +0000
+++ b/lang/clang-tools-extra/Makefile   Sat Aug 13 09:58:03 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2022/08/12 08:50:58 pin Exp $
+# $NetBSD: Makefile,v 1.19 2022/08/13 09:58:04 tnn Exp $
 
 .include "../../lang/clang/Makefile.common"
 
@@ -8,21 +8,21 @@
 
 DEPENDS+=      clang>=${LLVM_VERSION}:../../lang/clang
 
-_EXTRA_DIST=           ${DISTNAME:S/clang/clang-tools-extra/}${EXTRACT_SUFX}
-SITES.${_EXTRA_DIST}=  ${MASTER_SITES:=${GITHUB_PROJECT}/releases/download/${GITHUB_RELEASE}/}
+EXTRA_DIST=            ${DISTNAME:S/clang/clang-tools-extra/}${EXTRACT_SUFX}
+SITES.${EXTRA_DIST}=   ${MASTER_SITES:=${GITHUB_PROJECT}/releases/download/${GITHUB_RELEASE}/}
 
-DISTFILES=     ${DEFAULT_DISTFILES} ${_EXTRA_DIST}
+DISTFILES=     ${DEFAULT_DISTFILES} ${EXTRA_DIST}
 
 BUILD_TARGET=  clang-change-namespace clang-apply-replacements clang-doc
 BUILD_TARGET+= clang-include-fixer clang-move clang-query clang-reorder-fields
 BUILD_TARGET+= clang-tidy clangd modularize pp-trace tool-template
-INSTALL_DIRS=  ../build/tools/extra
+INSTALL_DIRS=  build/tools/extra
 
 REPLACE_PYTHON+=       tools/extra/clang-include-fixer/find-all-symbols/tool/run-find-all-symbols.py
 REPLACE_PYTHON+=       tools/extra/clang-tidy/tool/clang-tidy-diff.py
 REPLACE_PYTHON+=       tools/extra/clang-tidy/tool/run-clang-tidy.py
 
-BUILDLINK_TRANSFORM.SunOS+=     rm:-Wl,-Bsymbolic-functions
+BUILDLINK_TRANSFORM.SunOS+=    rm:-Wl,-Bsymbolic-functions
 
 .PHONY: inject-clang-tools
 post-extract: inject-clang-tools
diff -r 659c1d138791 -r 19a3865b82e3 lang/clang/Makefile
--- a/lang/clang/Makefile       Sat Aug 13 09:56:45 2022 +0000
+++ b/lang/clang/Makefile       Sat Aug 13 09:58:03 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.72 2022/08/12 19:03:39 tnn Exp $
+# $NetBSD: Makefile,v 1.73 2022/08/13 09:58:03 tnn Exp $
 
 .include "Makefile.common"
 
@@ -7,7 +7,7 @@
 USE_TOOLS+=    perl:run
 
 PLIST_VARS+=   RISCV
-.if !empty(PKG_BUILD_OPTIONS.llvm:Mllvm-target-riscv)
+.if ${PKG_BUILD_OPTIONS.llvm:Mllvm-target-riscv}
 PLIST.RISCV=   yes
 .endif
 
diff -r 659c1d138791 -r 19a3865b82e3 lang/clang/Makefile.common
--- a/lang/clang/Makefile.common        Sat Aug 13 09:56:45 2022 +0000
+++ b/lang/clang/Makefile.common        Sat Aug 13 09:58:03 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.50 2022/08/12 08:45:44 pin Exp $
+# $NetBSD: Makefile.common,v 1.51 2022/08/13 09:58:03 tnn Exp $
 # used by lang/clang/Makefile
 # used by lang/clang-tools-extra/Makefile
 
@@ -12,7 +12,7 @@
 COMMENT=       C language family frontend for LLVM
 LICENSE=       apache-2.0
 
-CONFIGURE_DIRS=                ${WRKDIR}/build
+CONFIGURE_DIRS=                build
 CMAKE_ARG_PATH=                ${WRKSRC}
 
 USE_LANGUAGES=         c c++14
@@ -147,7 +147,7 @@
 CMAKE_ARGS+=           -DCLANG_INCLUDE_TESTS=ON
 TEST_TARGET=           clang-test
 TEST_ENV+=             LD_LIBRARY_PATH=${WRKDIR}/build/lib
-.include "../../devel/googletest/buildlink3.mk"
+.  include "../../devel/googletest/buildlink3.mk"
 .else
 CMAKE_ARGS+=           -DLLVM_INCLUDE_TESTS=OFF
 CMAKE_ARGS+=           -DCLANG_INCLUDE_TESTS=OFF
@@ -156,15 +156,15 @@
 .include "../../lang/llvm/buildlink3.mk"
 
 .if !empty(PKG_OPTIONS:Mz3)
-.if empty(PKG_BUILD_OPTIONS.llvm:Mz3)
+.  if empty(PKG_BUILD_OPTIONS.llvm:Mz3)
 PKG_FAIL_REASON+=      "z3 PKG_OPTION must be enabled in lang/llvm"
-.endif
-.include "../../math/z3/buildlink3.mk"
+.  endif
+.  include "../../math/z3/buildlink3.mk"
 CMAKE_ARGS+=           -DLLVM_ENABLE_Z3_SOLVER=ON
 .endif
 
 post-extract:
-       ${MKDIR} ${WRKDIR}/build
+       ${MKDIR} ${WRKSRC}/build
 
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
diff -r 659c1d138791 -r 19a3865b82e3 lang/clang/distinfo
--- a/lang/clang/distinfo       Sat Aug 13 09:56:45 2022 +0000
+++ b/lang/clang/distinfo       Sat Aug 13 09:58:03 2022 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.74 2022/08/12 08:45:44 pin Exp $
+$NetBSD: distinfo,v 1.75 2022/08/13 09:58:03 tnn Exp $
 
 BLAKE2s (clang-14.0.6.src.tar.xz) = a39d30a3475f93605cf5cf63374500d78b1583e5c738b3ad7693a9ef08c137c4
 SHA512 (clang-14.0.6.src.tar.xz) = 5f5497b57dd116225e90f321902f1015beb50c0b1bb90d0fc6c026f13aa748feabe44f98eb75e86f98f3b1785ad5e850210732f3eae75b942ecd520527dcd30b
@@ -7,5 +7,6 @@
 SHA1 (patch-lib_Driver_ToolChain.cpp) = 33a8e346a72893140fde42245e4b108f3a9b9e3e
 SHA1 (patch-lib_Driver_ToolChains_Solaris.cpp) = 29e6ca7cf0bf0b01f50305f50cd555cbb75995e1
 SHA1 (patch-lib_Driver_ToolChains_Solaris.h) = 22d1ddef34b8df3cc29c4632108d45904797aff3
+SHA1 (patch-lib_Lex_InitHeaderSearch.cpp) = e5cd01d0950f2d9f29b295b2c6da42ec73ce81ca
 SHA1 (patch-tools_clang-shlib_CMakeLists.txt) = 2dce9cfc1e114a79fab457211eea1ee93c2198f4
 SHA1 (patch-tools_libclang_CMakeLists.txt) = 7e5655fc753ef20c8b08d1de438b26dcd3434525
diff -r 659c1d138791 -r 19a3865b82e3 lang/clang/patches/patch-lib_Frontend_InitHeaderSearch.cpp
--- a/lang/clang/patches/patch-lib_Frontend_InitHeaderSearch.cpp        Sat Aug 13 09:56:45 2022 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-$NetBSD: patch-lib_Frontend_InitHeaderSearch.cpp,v 1.2 2018/12/09 20:04:38 adam Exp $
-
-Don't add /usr/local/include by default on Solaris.
-
---- lib/Frontend/InitHeaderSearch.cpp.orig     2018-06-28 23:23:45.000000000 +0000
-+++ lib/Frontend/InitHeaderSearch.cpp
-@@ -221,6 +221,7 @@ void InitHeaderSearch::AddDefaultCInclud
-     case llvm::Triple::PS4:
-     case llvm::Triple::ELFIAMCU:
-     case llvm::Triple::Fuchsia:
-+    case llvm::Triple::Solaris:
-       break;
-     case llvm::Triple::Win32:
-       if (triple.getEnvironment() != llvm::Triple::Cygnus)
diff -r 659c1d138791 -r 19a3865b82e3 lang/clang/patches/patch-lib_Lex_InitHeaderSearch.cpp
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/clang/patches/patch-lib_Lex_InitHeaderSearch.cpp     Sat Aug 13 09:58:03 2022 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-lib_Lex_InitHeaderSearch.cpp,v 1.1 2022/08/13 09:58:04 tnn Exp $
+
+Don't add /usr/local/include by default on Solaris.
+was: patch-lib_Frontend_InitHeaderSearch.cpp
+
+--- lib/Lex/InitHeaderSearch.cpp.orig  2022-06-22 16:46:24.000000000 +0000
++++ lib/Lex/InitHeaderSearch.cpp
+@@ -241,6 +241,7 @@ void InitHeaderSearch::AddDefaultCInclud
+     case llvm::Triple::PS4:
+     case llvm::Triple::ELFIAMCU:
+     case llvm::Triple::Fuchsia:
++    case llvm::Triple::Solaris:
+       break;
+     case llvm::Triple::Win32:
+       if (triple.getEnvironment() != llvm::Triple::Cygnus)