git: f0a48f0f28c2 - main - devel/lvm13: fix build without LLDB

Reply: Thierry Thomas : "Re: git: f0a48f0f28c2 - main - devel/lvm13: fix build without LLDB"
Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Brooks Davis <brooks_at_FreeBSD.org>
Date: Thu, 10 Feb 2022 18:13:24 UTC
The branch main has been updated by brooks:

URL: https://cgit.FreeBSD.org/ports/commit/?id=f0a48f0f28c23add582223feb72a8b7d35c548af

commit f0a48f0f28c23add582223feb72a8b7d35c548af
Author:     Brooks Davis <brooks@FreeBSD.org>
AuthorDate: 2022-02-10 18:13:02 +0000
Commit:     Brooks Davis <brooks@FreeBSD.org>
CommitDate: 2022-02-10 18:13:02 +0000

    devel/lvm13: fix build without LLDB
    
    While here, correctly identify several scanbuild-related files as being
    part of clang.
    
    PR:             261374
    Reported by:    pkubaj
---
 devel/llvm13/Makefile  |  5 ++++-
 devel/llvm13/pkg-plist | 38 +++++++++++++++++++-------------------
 2 files changed, 23 insertions(+), 20 deletions(-)

diff --git a/devel/llvm13/Makefile b/devel/llvm13/Makefile
index 67f500cd695f..642126d32fd8 100644
--- a/devel/llvm13/Makefile
+++ b/devel/llvm13/Makefile
@@ -297,7 +297,7 @@ MAN1SRCS+=	clang.1 \
 		clang-tblgen.1 \
 		diagtool.1 \
 		scan-build.1
-CLANG_PATTERN=	(c-index-test|clang|diagtool|hmaptool|scan-|Reporter.py|ScanView.py|scanview.css|sorttable.js|startfile.py|-analyzer|AnalyzerPlugin.so)
+CLANG_PATTERN=	(c-index-test|clang|diagtool|hmaptool|intercept-|libear|libscanbuild|analyze-|scan-|Reporter.py|ScanView.py|scanview.css|sorttable.js|startfile.py|-analyzer|AnalyzerPlugin.so)
 USES+=		gnome
 .endif
 
@@ -546,6 +546,9 @@ post-install-DOCS-on:
 	${RM} ${STAGEDIR}${LLVM_PREFIX}/share/man/man1/lit.1
 	${RM} ${STAGEDIR}${LLVM_PREFIX}/share/man/man1/FileCheck.1
 .endif
+.if ! ${PORT_OPTIONS:MLLDB}
+	${RM} ${STAGEDIR}${LLVM_PREFIX}/share/man/man1/lldb-tblgen.1
+.endif
 .if ! ${PORT_OPTIONS:MMLIR}
 	${RM} ${STAGEDIR}${LLVM_PREFIX}/share/man/man1/mlir-tblgen.1
 .endif
diff --git a/devel/llvm13/pkg-plist b/devel/llvm13/pkg-plist
index 0519d19b3ae6..a2453cda1bb6 100644
--- a/devel/llvm13/pkg-plist
+++ b/devel/llvm13/pkg-plist
@@ -63,7 +63,7 @@ bin/llvm-xray%%LLVM_SUFFIX%%
 bin/opt%%LLVM_SUFFIX%%
 bin/sancov%%LLVM_SUFFIX%%
 bin/split-file%%LLVM_SUFFIX%%
-bin/analyze-build%%LLVM_SUFFIX%%
+%%CLANG%%bin/analyze-build%%LLVM_SUFFIX%%
 %%CLANG%%bin/c-index-test%%LLVM_SUFFIX%%
 %%CLANG%%bin/clang%%LLVM_SUFFIX%%
 %%CLANG%%bin/clang++%%LLVM_SUFFIX%%
@@ -78,7 +78,7 @@ bin/analyze-build%%LLVM_SUFFIX%%
 %%CLANG%%bin/clang-scan-deps%%LLVM_SUFFIX%%
 %%CLANG%%bin/diagtool%%LLVM_SUFFIX%%
 %%CLANG%%bin/hmaptool%%LLVM_SUFFIX%%
-bin/intercept-build%%LLVM_SUFFIX%%
+%%CLANG%%bin/intercept-build%%LLVM_SUFFIX%%
 %%CLANG%%bin/scan-build%%LLVM_SUFFIX%%
 %%CLANG%%bin/scan-build-py%%LLVM_SUFFIX%%
 %%CLANG%%bin/scan-view%%LLVM_SUFFIX%%
@@ -150,7 +150,7 @@ bin/intercept-build%%LLVM_SUFFIX%%
 %%LLDB%%llvm%%LLVM_SUFFIX%%/%%PYTHON_SITELIBDIR%%/lldb/utils/in_call_stack.py
 %%LLDB%%llvm%%LLVM_SUFFIX%%/%%PYTHON_SITELIBDIR%%/lldb/utils/symbolication.py
 %%LLDB%%llvm%%LLVM_SUFFIX%%/%%PYTHON_SITELIBDIR%%/six.py
-llvm%%LLVM_SUFFIX%%/bin/analyze-build
+%%CLANG%%llvm%%LLVM_SUFFIX%%/bin/analyze-build
 llvm%%LLVM_SUFFIX%%/bin/bugpoint
 %%CLANG%%llvm%%LLVM_SUFFIX%%/bin/c-index-test
 %%CLANG%%llvm%%LLVM_SUFFIX%%/bin/clang
@@ -187,7 +187,7 @@ llvm%%LLVM_SUFFIX%%/bin/dsymutil
 %%FLANG%%llvm%%LLVM_SUFFIX%%/bin/flang-new
 %%CLANG%%llvm%%LLVM_SUFFIX%%/bin/git-clang-format
 %%CLANG%%llvm%%LLVM_SUFFIX%%/bin/hmaptool
-llvm%%LLVM_SUFFIX%%/bin/intercept-build
+%%CLANG%%llvm%%LLVM_SUFFIX%%/bin/intercept-build
 %%LLD%%llvm%%LLVM_SUFFIX%%/bin/ld
 %%LLD%%llvm%%LLVM_SUFFIX%%/bin/ld.lld
 %%LLD%%llvm%%LLVM_SUFFIX%%/bin/ld64.lld
@@ -4993,9 +4993,9 @@ llvm%%LLVM_SUFFIX%%/lib/libRemarks.so.%%LLVM_MAJOR%%
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangTransformer.a
 %%EXTRAS%%llvm%%LLVM_SUFFIX%%/lib/libclangdRemoteIndex.a
 %%EXTRAS%%llvm%%LLVM_SUFFIX%%/lib/libclangdSupport.a
-llvm%%LLVM_SUFFIX%%/lib/libear/__init__.py
-llvm%%LLVM_SUFFIX%%/lib/libear/config.h.in
-llvm%%LLVM_SUFFIX%%/lib/libear/ear.c
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libear/__init__.py
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libear/config.h.in
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libear/ear.c
 %%EXTRAS%%llvm%%LLVM_SUFFIX%%/lib/libfindAllSymbols.a
 %%FLANG%%llvm%%LLVM_SUFFIX%%/lib/libflangFrontend.a
 %%FLANG%%llvm%%LLVM_SUFFIX%%/lib/libflangFrontendTool.a
@@ -5024,23 +5024,23 @@ llvm%%LLVM_SUFFIX%%/lib/libear/ear.c
 %%OPENMP%%llvm%%LLVM_SUFFIX%%/lib/libomp.so
 %%OPENMP%%llvm%%LLVM_SUFFIX%%/lib/libomptarget.rtl.amdgpu.so
 %%OPENMP%%llvm%%LLVM_SUFFIX%%/lib/libomptarget.so
-llvm%%LLVM_SUFFIX%%/lib/libscanbuild/__init__.py
-llvm%%LLVM_SUFFIX%%/lib/libscanbuild/analyze.py
-llvm%%LLVM_SUFFIX%%/lib/libscanbuild/arguments.py
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libscanbuild/__init__.py
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libscanbuild/analyze.py
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libscanbuild/arguments.py
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libscanbuild/clang.py
-llvm%%LLVM_SUFFIX%%/lib/libscanbuild/compilation.py
-llvm%%LLVM_SUFFIX%%/lib/libscanbuild/intercept.py
-llvm%%LLVM_SUFFIX%%/lib/libscanbuild/report.py
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libscanbuild/compilation.py
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libscanbuild/intercept.py
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libscanbuild/report.py
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libscanbuild/resources/scanview.css
-llvm%%LLVM_SUFFIX%%/lib/libscanbuild/resources/selectable.js
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libscanbuild/resources/selectable.js
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libscanbuild/resources/sorttable.js
-llvm%%LLVM_SUFFIX%%/lib/libscanbuild/shell.py
-llvm%%LLVM_SUFFIX%%/libexec/analyze-c++
-llvm%%LLVM_SUFFIX%%/libexec/analyze-cc
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libscanbuild/shell.py
+%%CLANG%%llvm%%LLVM_SUFFIX%%/libexec/analyze-c++
+%%CLANG%%llvm%%LLVM_SUFFIX%%/libexec/analyze-cc
 %%CLANG%%llvm%%LLVM_SUFFIX%%/libexec/c++-analyzer
 %%CLANG%%llvm%%LLVM_SUFFIX%%/libexec/ccc-analyzer
-llvm%%LLVM_SUFFIX%%/libexec/intercept-c++
-llvm%%LLVM_SUFFIX%%/libexec/intercept-cc
+%%CLANG%%llvm%%LLVM_SUFFIX%%/libexec/intercept-c++
+%%CLANG%%llvm%%LLVM_SUFFIX%%/libexec/intercept-cc
 %%CLANG%%llvm%%LLVM_SUFFIX%%/share/clang/bash-autocomplete.sh
 %%EXTRAS%%llvm%%LLVM_SUFFIX%%/share/clang/clang-doc-default-stylesheet.css
 %%CLANG%%llvm%%LLVM_SUFFIX%%/share/clang/clang-format-bbedit.applescript