git: f307f6541eaa - main - devel/llvm18: Update to 18.1.0rc3

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Brooks Davis <brooks_at_FreeBSD.org>
Date: Wed, 21 Feb 2024 21:33:01 UTC
The branch main has been updated by brooks:

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

commit f307f6541eaaed094941e65de46dcf44e5ea058c
Author:     Brooks Davis <brooks@FreeBSD.org>
AuthorDate: 2024-02-21 18:39:02 +0000
Commit:     Brooks Davis <brooks@FreeBSD.org>
CommitDate: 2024-02-21 21:28:19 +0000

    devel/llvm18: Update to 18.1.0rc3
    
    Add a build conflict with ${ARCH}-binutils for COMPILER_RT to avoid
    plist issues.  Technically this is only an issue for 64-bit
    architectures that build 32-bit sanitizers (the presence of <triple>-ld
    is picked up and it doesn't pass some cmake test), but it's easier to
    just block all of them.
---
 devel/llvm18/Makefile  |  3 ++-
 devel/llvm18/distinfo  |  6 +++---
 devel/llvm18/pkg-plist | 28 ++++++++++++++--------------
 3 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/devel/llvm18/Makefile b/devel/llvm18/Makefile
index acac0211f0ba..752a9218c046 100644
--- a/devel/llvm18/Makefile
+++ b/devel/llvm18/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	llvm
-DISTVERSION=	18.1.0rc2
+DISTVERSION=	18.1.0rc3
 PORTREVISION=	0
 CATEGORIES=	devel lang
 MASTER_SITES=	https://github.com/llvm/llvm-project/releases/download/llvmorg-${DISTVERSION:S/rc/-rc/}/ \
@@ -154,6 +154,7 @@ CLANG_USE=		PERL5=build
 COMPILER_RT_DESC=	Sanitizer libraries
 COMPILER_RT_CMAKE_ON=	-DCOMPILER_RT_INSTALL_PATH=${LLVM_PREFIX}/lib/clang/${LLVM_RELEASE}
 COMPILER_RT_PLIST_FILES=${_COMPILER_RT_LIBS}
+COMPILER_RT_CONFLICTS_BUILD=${ARCH}-binutils
 DOCS_BUILD_DEPENDS= \
 	${PYTHON_PKGNAMEPREFIX}myst-parser>0:textproc/py-myst-parser@${PY_FLAVOR} \
 	${PYTHON_PKGNAMEPREFIX}sphinx-markdown-tables>=0:textproc/py-sphinx-markdown-tables@${PY_FLAVOR} \
diff --git a/devel/llvm18/distinfo b/devel/llvm18/distinfo
index 206267e59050..b35aab26733c 100644
--- a/devel/llvm18/distinfo
+++ b/devel/llvm18/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1707321448
-SHA256 (llvm-project-18.1.0rc2.src.tar.xz) = 780b2fae0a6abeb9c2747231ea743896ba513d6180011aebb2eac53e62e9fc3e
-SIZE (llvm-project-18.1.0rc2.src.tar.xz) = 131993176
+TIMESTAMP = 1708532830
+SHA256 (llvm-project-18.1.0rc3.src.tar.xz) = 6adb959fd2ad7e62b08e699e9376112b6d7d57ec8c2b6b2590eda4789aaaa270
+SIZE (llvm-project-18.1.0rc3.src.tar.xz) = 132011280
diff --git a/devel/llvm18/pkg-plist b/devel/llvm18/pkg-plist
index f8f8999f5cdc..a13f122e91dc 100644
--- a/devel/llvm18/pkg-plist
+++ b/devel/llvm18/pkg-plist
@@ -6207,10 +6207,10 @@ llvm%%LLVM_SUFFIX%%/lib/cmake/llvm/llvm-driver-template.cpp.in
 %%STATIC_LIBS%%%%FLANG%%llvm%%LLVM_SUFFIX%%/lib/libFortran_main.a
 %%STATIC_LIBS%%%%FLANG%%llvm%%LLVM_SUFFIX%%/lib/libHLFIRDialect.a
 %%STATIC_LIBS%%%%FLANG%%llvm%%LLVM_SUFFIX%%/lib/libHLFIRTransforms.a
-llvm%%LLVM_SUFFIX%%/lib/libLLVM-%%LLVM_RELEASE%%rc.so
 llvm%%LLVM_SUFFIX%%/lib/libLLVM-18.so
 llvm%%LLVM_SUFFIX%%/lib/libLLVM-18rc.so
 llvm%%LLVM_SUFFIX%%/lib/libLLVM.so
+llvm%%LLVM_SUFFIX%%/lib/libLLVM.so.18.1rc
 %%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMAggressiveInstCombine.a
 %%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMAnalysis.a
 %%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMAsmParser.a
@@ -6302,9 +6302,9 @@ llvm%%LLVM_SUFFIX%%/lib/libLLVM.so
 %%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMXRay.a
 %%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMipo.a
 llvm%%LLVM_SUFFIX%%/lib/libLTO.so
-llvm%%LLVM_SUFFIX%%/lib/libLTO.so.18rc
+llvm%%LLVM_SUFFIX%%/lib/libLTO.so.18.1rc
 %%MLIR%%llvm%%LLVM_SUFFIX%%/lib/libMLIR.so
-%%MLIR%%llvm%%LLVM_SUFFIX%%/lib/libMLIR.so.18rc
+%%MLIR%%llvm%%LLVM_SUFFIX%%/lib/libMLIR.so.18.1rc
 %%STATIC_LIBS%%%%MLIR%%llvm%%LLVM_SUFFIX%%/lib/libMLIRAMDGPUDialect.a
 %%STATIC_LIBS%%%%MLIR%%llvm%%LLVM_SUFFIX%%/lib/libMLIRAMDGPUToROCDL.a
 %%STATIC_LIBS%%%%MLIR%%llvm%%LLVM_SUFFIX%%/lib/libMLIRAMDGPUTransforms.a
@@ -6641,14 +6641,14 @@ llvm%%LLVM_SUFFIX%%/lib/libLTO.so.18rc
 %%STATIC_LIBS%%%%POLLY%%llvm%%LLVM_SUFFIX%%/lib/libPolly.a
 %%STATIC_LIBS%%%%POLLY%%llvm%%LLVM_SUFFIX%%/lib/libPollyISL.a
 llvm%%LLVM_SUFFIX%%/lib/libRemarks.so
-llvm%%LLVM_SUFFIX%%/lib/libRemarks.so.18rc
+llvm%%LLVM_SUFFIX%%/lib/libRemarks.so.18.1rc
 %%OPENMP%%llvm%%LLVM_SUFFIX%%/lib/libarcher.so
 %%STATIC_LIBS%%%%OPENMP%%llvm%%LLVM_SUFFIX%%/lib/libarcher_static.a
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclang-cpp.so
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclang-cpp.so.18rc
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclang-cpp.so.18.1rc
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclang.so
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclang.so.%%LLVM_RELEASE%%rc
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclang.so.18rc
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclang.so.18.1rc
 %%STATIC_LIBS%%%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangAPINotes.a
 %%STATIC_LIBS%%%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangARCMigrate.a
 %%STATIC_LIBS%%%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangAST.a
@@ -6753,22 +6753,22 @@ llvm%%LLVM_SUFFIX%%/lib/libRemarks.so.18rc
 %%STATIC_LIBS%%%%LLD%%llvm%%LLVM_SUFFIX%%/lib/liblldWasm.a
 %%LLDB%%llvm%%LLVM_SUFFIX%%/lib/liblldb.so
 %%LLDB%%llvm%%LLVM_SUFFIX%%/lib/liblldb.so.%%LLVM_RELEASE%%rc
-%%LLDB%%llvm%%LLVM_SUFFIX%%/lib/liblldb.so.18rc
+%%LLDB%%llvm%%LLVM_SUFFIX%%/lib/liblldb.so.18.1rc
 %%MLIR%%llvm%%LLVM_SUFFIX%%/lib/libmlir_arm_runner_utils.so
-%%MLIR%%llvm%%LLVM_SUFFIX%%/lib/libmlir_arm_runner_utils.so.18rc
+%%MLIR%%llvm%%LLVM_SUFFIX%%/lib/libmlir_arm_runner_utils.so.18.1rc
 %%MLIR%%llvm%%LLVM_SUFFIX%%/lib/libmlir_arm_sme_abi_stubs.so
-%%MLIR%%llvm%%LLVM_SUFFIX%%/lib/libmlir_arm_sme_abi_stubs.so.18rc
+%%MLIR%%llvm%%LLVM_SUFFIX%%/lib/libmlir_arm_sme_abi_stubs.so.18.1rc
 %%MLIR%%llvm%%LLVM_SUFFIX%%/lib/libmlir_async_runtime.so
-%%MLIR%%llvm%%LLVM_SUFFIX%%/lib/libmlir_async_runtime.so.18rc
+%%MLIR%%llvm%%LLVM_SUFFIX%%/lib/libmlir_async_runtime.so.18.1rc
 %%MLIR%%llvm%%LLVM_SUFFIX%%/lib/libmlir_c_runner_utils.so
-%%MLIR%%llvm%%LLVM_SUFFIX%%/lib/libmlir_c_runner_utils.so.18rc
+%%MLIR%%llvm%%LLVM_SUFFIX%%/lib/libmlir_c_runner_utils.so.18.1rc
 %%MLIR%%llvm%%LLVM_SUFFIX%%/lib/libmlir_float16_utils.so
-%%MLIR%%llvm%%LLVM_SUFFIX%%/lib/libmlir_float16_utils.so.18rc
+%%MLIR%%llvm%%LLVM_SUFFIX%%/lib/libmlir_float16_utils.so.18.1rc
 %%MLIR%%llvm%%LLVM_SUFFIX%%/lib/libmlir_runner_utils.so
-%%MLIR%%llvm%%LLVM_SUFFIX%%/lib/libmlir_runner_utils.so.18rc
+%%MLIR%%llvm%%LLVM_SUFFIX%%/lib/libmlir_runner_utils.so.18.1rc
 %%OPENMP%%llvm%%LLVM_SUFFIX%%/lib/libomp.so
 %%OPENMP%%llvm%%LLVM_SUFFIX%%/lib/libomptarget.so
-%%OPENMP%%llvm%%LLVM_SUFFIX%%/lib/libomptarget.so.18rc
+%%OPENMP%%llvm%%LLVM_SUFFIX%%/lib/libomptarget.so.18.1rc
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libscanbuild/__init__.py
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libscanbuild/analyze.py
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libscanbuild/arguments.py