From nobody Thu Feb 10 18:20:13 2022 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 8D5FF19BF6DC; Thu, 10 Feb 2022 18:20:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JvlR13TSkz4T4V; Thu, 10 Feb 2022 18:20:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644517213; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ggcPh1r0mvstiTt3/AS/pzt+Muf8vcSpFGMXExU2z3w=; b=lOHVp7E3e2EglZ/WY2WgoEtC4EWJaP7sZWwrFHJHXLF0nzZaEQh9+rDG/jSzvOFJBxJKpn vOHKiuftgeaY4SByteI9/63SCqhV1C9DqVPO87YQhBdZxk/Y8+B4tFSBoYn1F2gYJ5xG8K KZiULwj7uUnKm/76n7WhU5QZ+SA1lVipyd4NHiPhzjL9rsXjTB8w56ejeFM7W6f5kpgtgQ GRAZEwLGAGhzKRPvYcH+pyK6JBMSZQ2nfdIzI9yAAZbgmVWAyD8NqSvcTbext00aX1ZknD V53TjVNYAXNoYGqraUcJge25ZNdwKW0jDBd1HnAUuEvchxtsU7+sxfC6NUiCsQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 57DC025147; Thu, 10 Feb 2022 18:20:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 21AIKDid019711; Thu, 10 Feb 2022 18:20:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21AIKD3W019703; Thu, 10 Feb 2022 18:20:13 GMT (envelope-from git) Date: Thu, 10 Feb 2022 18:20:13 GMT Message-Id: <202202101820.21AIKD3W019703@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Brooks Davis Subject: git: 1014f85dc2ad - 2022Q1 - devel/lvm13: fix build without LLDB List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: ports X-Git-Refname: refs/heads/2022Q1 X-Git-Reftype: branch X-Git-Commit: 1014f85dc2ad6c31c60fff10f39468f5c48a26c0 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644517213; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ggcPh1r0mvstiTt3/AS/pzt+Muf8vcSpFGMXExU2z3w=; b=knwSPBR65g+NEKZONviplCp0zpXxRmrBZ/HnaWJbOmj0CwOfv0/8bUpRpT6W0uidBTOufy +Py5VJ/s0aKSxXb1McSdgrORLb9rAXTFg0//whrvAg+XuQolgx2kpl4eyw7BChr2e3FefQ +YSA4eAK8QhJjWB/VgSWbl4XbDGkZKBq4xxtGXK29gi62UQ+YYRZFvqlchcC3OoA8qb8QS tcDeSJh0HaW3CG2FgXDaPHyz/2gROw/mbdincT1ACjFMFZhEGnkTWIm1dYz1v/54D90q8J ysdlce8cb7HxZjFYVXQhJH+dhdDTRh6X3AZPbiJLebgwL0Iq5RImgyelcUwAXw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1644517213; a=rsa-sha256; cv=none; b=W7hJQi8Mbv/CCBCTL8bpnD82Xj/woH+ljPuE4u0JznKjNls1Z84PKT/kvhh2LZKLCXRs7P oEBCk8+yeENM36WqaKqwRXN3FauuVG8jmnL40ANygqxGrVmJczPrMhdmHAZLD3I8nPO9tv P1IgIPqrvwN1z5D8Wui4DHpmRtuxD26qetq35/MTsv2F+LYzcb5si978JpBIc+k1NxNCup F7kYBb7VzHfrolWKntluh607owGDmuiw3pM1FLMQfFRoBQsLV3FbfFjW9JIeuZrua04g+Q ObHuJYE/4Vp9siw3S8gJhD9LvRrTJ69pLcECiN/yVdNXvY+dP9lBiGTne4H9LA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch 2022Q1 has been updated by brooks: URL: https://cgit.FreeBSD.org/ports/commit/?id=1014f85dc2ad6c31c60fff10f39468f5c48a26c0 commit 1014f85dc2ad6c31c60fff10f39468f5c48a26c0 Author: Brooks Davis AuthorDate: 2022-02-10 18:13:02 +0000 Commit: Brooks Davis CommitDate: 2022-02-10 18:20:04 +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 (cherry picked from commit f0a48f0f28c23add582223feb72a8b7d35c548af) --- 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