git: 1d5b2f98a418 - main - devel/llvm12: Update to 12.0.1 release

[Brooks Davis]

The branch main has been updated by brooks:

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

commit 1d5b2f98a4186c8ed4ba8e5524651412cd16868d
Author:     Brooks Davis <brooks at FreeBSD.org>
AuthorDate: 2021-07-16 18:00:30 +0000
Commit:     Brooks Davis <brooks at FreeBSD.org>
CommitDate: 2021-07-16 18:00:30 +0000

    devel/llvm12: Update to 12.0.1 release
    
    This release restores Reporter.py required for scan-build. [0]
    
    Correct missing renames of lit modules. [1]
    
    Remove no-op LLD_LINK option.
    
    PR:             256297 [0], 257123 [1]
    Reported by:    phk [0], Derek Schrock <dereks at lifeofadishwasher.com> [1]
---
 devel/llvm12/Makefile  | 12 +++++-------
 devel/llvm12/distinfo  |  6 +++---
 devel/llvm12/pkg-plist |  1 +
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/devel/llvm12/Makefile b/devel/llvm12/Makefile
index 1d4c5a92fa73..57f6aeb8fcb4 100644
--- a/devel/llvm12/Makefile
+++ b/devel/llvm12/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	llvm
-DISTVERSION=	12.0.0
-PORTREVISION=	1
+DISTVERSION=	12.0.1
+PORTREVISION=	0
 CATEGORIES=	devel lang
 MASTER_SITES=	https://github.com/llvm/llvm-project/releases/download/llvmorg-${DISTVERSION:S/rc/-rc/}/ \
 		https://${PRE_}releases.llvm.org/${LLVM_RELEASE}/${RCDIR}
@@ -72,7 +72,7 @@ CMAKE_ARGS+=	-DLLVM_ENABLE_TERMINFO=OFF
 CFLAGS+=	-DNDEBUG
 CXXFLAGS+=	-DNDEBUG
 
-OPTIONS_DEFINE=	BE_AMDGPU CLANG DOCS EXTRAS LIT LLD LLD_LINK PYCLANG
+OPTIONS_DEFINE=	BE_AMDGPU CLANG DOCS EXTRAS LIT LLD PYCLANG
 OPTIONS_DEFINE_aarch64=	OPENMP
 OPTIONS_DEFINE_amd64=	COMPILER_RT GOLD LLDB OPENMP
 OPTIONS_DEFINE_i386=	COMPILER_RT LLDB OPENMP
@@ -80,7 +80,7 @@ OPTIONS_DEFINE_powerpc=	GOLD
 OPTIONS_DEFINE_powerpc64=	GOLD OPENMP
 OPTIONS_DEFINE_powerpc64le=	GOLD OPENMP
 OPTIONS_DEFINE_riscv64=	OPENMP
-OPTIONS_DEFAULT=	BE_AMDGPU BE_STANDARD CLANG EXTRAS LIT LLD LLD_LINK PYCLANG
+OPTIONS_DEFAULT=	BE_AMDGPU BE_STANDARD CLANG EXTRAS LIT LLD PYCLANG
 OPTIONS_DEFAULT_aarch64=	OPENMP
 OPTIONS_DEFAULT_amd64=	COMPILER_RT GOLD LLDB OPENMP
 OPTIONS_DEFAULT_i386=	COMPILER_RT LLDB OPENMP
@@ -142,8 +142,6 @@ GOLD_BUILD_DEPENDS=	${LOCALBASE}/bin/ld.gold:devel/binutils
 LIT_DESC=		Install lit and FileCheck test tools
 LIT_VARS=		_USES_PYTHON=python:3.6+
 LLD_DESC=		Install lld, the LLVM linker
-LLD_LINK_DESC=		Link ld.lld as ld to clang uses it
-LLD_LINK_IMPLIES=	LLD
 LLDB_BUILD_DEPENDS=	swig:devel/swig
 LLDB_CMAKE_ON=		-DLUA_INCLUDE_DIR=${LOCALBASE}/include/lua${LUA_VER_STR} \
 			-DLUA_LIBRARY=${LOCALBASE}/lib/liblua-${LUA_VER}.so \
@@ -456,7 +454,7 @@ PLIST_SUB+=     ${opt}="@comment "
 post-patch:
 	${REINPLACE_CMD} -e 's|import lit|import lit${LLVM_SUFFIX}|' \
 	    -e 's|from lit|from lit${LLVM_SUFFIX}|' \
-	    -e 's|lit\.|lit${LLVM_SUFFIX}.|' \
+	    -e 's|lit\.|lit${LLVM_SUFFIX}.|g' \
 	    ${WRKSRC}/llvm/utils/lit/lit.py \
 	    ${WRKSRC}/llvm/utils/lit/lit/*.py \
 	    ${WRKSRC}/llvm/utils/lit/lit/formats/*.py
diff --git a/devel/llvm12/distinfo b/devel/llvm12/distinfo
index ee71f9aac0f3..0c1d92850e85 100644
--- a/devel/llvm12/distinfo
+++ b/devel/llvm12/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1619034049
-SHA256 (llvm-project-12.0.0.src.tar.xz) = 9ed1688943a4402d7c904cc4515798cdb20080066efa010fe7e1f2551b423628
-SIZE (llvm-project-12.0.0.src.tar.xz) = 90884060
+TIMESTAMP = 1626371873
+SHA256 (llvm-project-12.0.1.src.tar.xz) = 129cb25cd13677aad951ce5c2deb0fe4afc1e9d98950f53b51bdcfb5a73afa0e
+SIZE (llvm-project-12.0.1.src.tar.xz) = 90910004
diff --git a/devel/llvm12/pkg-plist b/devel/llvm12/pkg-plist
index 31c7731f28c3..1ce4c78f62de 100644
--- a/devel/llvm12/pkg-plist
+++ b/devel/llvm12/pkg-plist
@@ -3765,6 +3765,7 @@ llvm%%LLVM_SUFFIX%%/share/opt-viewer/optrecord.py
 llvm%%LLVM_SUFFIX%%/share/opt-viewer/style.css
 %%CLANG%%llvm%%LLVM_SUFFIX%%/share/scan-build/scanview.css
 %%CLANG%%llvm%%LLVM_SUFFIX%%/share/scan-build/sorttable.js
+%%CLANG%%llvm%%LLVM_SUFFIX%%/share/scan-view/Reporter.py
 %%CLANG%%llvm%%LLVM_SUFFIX%%/share/scan-view/ScanView.py
 %%CLANG%%llvm%%LLVM_SUFFIX%%/share/scan-view/bugcatcher.ico
 %%CLANG%%llvm%%LLVM_SUFFIX%%/share/scan-view/startfile.py