Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 9 Aug 2023 17:43:47 GMT
From:      Brooks Davis <brooks@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 951826f3a7ab - main - devel/llvm17: Update to 17.0.0rc2
Message-ID:  <202308091743.379HhlVQ059535@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by brooks:

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

commit 951826f3a7abb908bb7b5769725531a62dbbf9be
Author:     Brooks Davis <brooks@FreeBSD.org>
AuthorDate: 2023-08-09 15:25:34 +0000
Commit:     Brooks Davis <brooks@FreeBSD.org>
CommitDate: 2023-08-09 17:43:42 +0000

    devel/llvm17: Update to 17.0.0rc2
    
    For changes see:
            https://discourse.llvm.org/t/llvm-17-0-0-rc2-released/72658
    
    COMPILER_RT is currently disabled for aarch64 as it is broken due to
    https://github.com/llvm/llvm-project/issues/63418.  Hopefully a fix will
    be found before the full release or I'll attempt use a smaller hammer
    that only disables ubsan.
---
 devel/llvm17/Makefile                        |  3 ++-
 devel/llvm17/distinfo                        |  6 +++---
 devel/llvm17/files/patch-llvm_CMakeLists.txt | 11 ++++++++++
 devel/llvm17/pkg-plist                       | 30 ++++++++++++++--------------
 4 files changed, 31 insertions(+), 19 deletions(-)

diff --git a/devel/llvm17/Makefile b/devel/llvm17/Makefile
index a851bc3be01c..6141a5580540 100644
--- a/devel/llvm17/Makefile
+++ b/devel/llvm17/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	llvm
-DISTVERSION=	17.0.0rc1
+DISTVERSION=	17.0.0rc2
 PORTREVISION=	0
 CATEGORIES=	devel lang
 MASTER_SITES=	https://github.com/llvm/llvm-project/releases/download/llvmorg-${DISTVERSION:S/rc/-rc/}/ \
@@ -95,6 +95,7 @@ OPTIONS_DEFINE=	BE_AMDGPU BE_WASM CLANG COMPILER_RT DOCS LLD STATIC_LIBS
 OPTIONS_DEFAULT=	BE_AMDGPU BE_WASM CLANG LLD
 OPTIONS_SINGLE=		BACKENDS
 OPTIONS_SINGLE_BACKENDS=BE_FREEBSD BE_NATIVE BE_STANDARD
+OPTIONS_EXCLUDE_aarch64=COMPILER_RT
 OPTIONS_EXCLUDE_armv6=	COMPILER_RT
 OPTIONS_EXCLUDE_armv7=	COMPILER_RT
 OPTIONS_SUB=	yes
diff --git a/devel/llvm17/distinfo b/devel/llvm17/distinfo
index ac31d9358305..430d3ab78e0e 100644
--- a/devel/llvm17/distinfo
+++ b/devel/llvm17/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1690827567
-SHA256 (llvm-project-17.0.0rc1.src.tar.xz) = 01b80625c131b8281dcf76a4e6395d10f45835c60e27357c92abf5a98c9a0337
-SIZE (llvm-project-17.0.0rc1.src.tar.xz) = 127805900
+TIMESTAMP = 1691506524
+SHA256 (llvm-project-17.0.0rc2.src.tar.xz) = 71c018a6c0d3f7ccfe66a8ea7a68281a256fcd3bc35099e61616a92dcbbf0859
+SIZE (llvm-project-17.0.0rc2.src.tar.xz) = 127795160
diff --git a/devel/llvm17/files/patch-llvm_CMakeLists.txt b/devel/llvm17/files/patch-llvm_CMakeLists.txt
new file mode 100644
index 000000000000..7787a5407c12
--- /dev/null
+++ b/devel/llvm17/files/patch-llvm_CMakeLists.txt
@@ -0,0 +1,11 @@
+--- llvm/CMakeLists.txt.orig
++++ llvm/CMakeLists.txt
+@@ -18,7 +18,7 @@
+   set(LLVM_VERSION_PATCH 0)
+ endif()
+ if(NOT DEFINED LLVM_VERSION_SUFFIX)
+-  set(LLVM_VERSION_SUFFIX -rc1)
++  set(LLVM_VERSION_SUFFIX -rc2)
+ endif()
+ 
+ if (NOT PACKAGE_VERSION)
diff --git a/devel/llvm17/pkg-plist b/devel/llvm17/pkg-plist
index 778ed4ac3f65..1a95ae731844 100644
--- a/devel/llvm17/pkg-plist
+++ b/devel/llvm17/pkg-plist
@@ -5886,8 +5886,8 @@ 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%%git.so
-llvm%%LLVM_SUFFIX%%/lib/libLLVM-17git.so
+llvm%%LLVM_SUFFIX%%/lib/libLLVM-%%LLVM_RELEASE%%-rc2.so
+llvm%%LLVM_SUFFIX%%/lib/libLLVM-17-rc2.so
 llvm%%LLVM_SUFFIX%%/lib/libLLVM.so
 %%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMAggressiveInstCombine.a
 %%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMAnalysis.a
@@ -5974,9 +5974,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.17git
+llvm%%LLVM_SUFFIX%%/lib/libLTO.so.17-rc2
 %%MLIR%%llvm%%LLVM_SUFFIX%%/lib/libMLIR.so
-%%MLIR%%llvm%%LLVM_SUFFIX%%/lib/libMLIR.so.17git
+%%MLIR%%llvm%%LLVM_SUFFIX%%/lib/libMLIR.so.17-rc2
 %%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
@@ -6269,14 +6269,14 @@ llvm%%LLVM_SUFFIX%%/lib/libLTO.so.17git
 %%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.17git
+llvm%%LLVM_SUFFIX%%/lib/libRemarks.so.17-rc2
 %%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.17git
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclang-cpp.so.17-rc2
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclang.so
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclang.so.%%LLVM_RELEASE%%git
-%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclang.so.17git
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclang.so.%%LLVM_RELEASE%%-rc2
+%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclang.so.17-rc2
 %%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
@@ -6380,19 +6380,19 @@ llvm%%LLVM_SUFFIX%%/lib/libRemarks.so.17git
 %%STATIC_LIBS%%%%LLD%%llvm%%LLVM_SUFFIX%%/lib/liblldMinGW.a
 %%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%%git
-%%LLDB%%llvm%%LLVM_SUFFIX%%/lib/liblldb.so.17git
+%%LLDB%%llvm%%LLVM_SUFFIX%%/lib/liblldb.so.%%LLVM_RELEASE%%-rc2
+%%LLDB%%llvm%%LLVM_SUFFIX%%/lib/liblldb.so.17-rc2
 %%MLIR%%llvm%%LLVM_SUFFIX%%/lib/libmlir_async_runtime.so
-%%MLIR%%llvm%%LLVM_SUFFIX%%/lib/libmlir_async_runtime.so.17git
+%%MLIR%%llvm%%LLVM_SUFFIX%%/lib/libmlir_async_runtime.so.17-rc2
 %%MLIR%%llvm%%LLVM_SUFFIX%%/lib/libmlir_c_runner_utils.so
-%%MLIR%%llvm%%LLVM_SUFFIX%%/lib/libmlir_c_runner_utils.so.17git
+%%MLIR%%llvm%%LLVM_SUFFIX%%/lib/libmlir_c_runner_utils.so.17-rc2
 %%MLIR%%llvm%%LLVM_SUFFIX%%/lib/libmlir_float16_utils.so
-%%MLIR%%llvm%%LLVM_SUFFIX%%/lib/libmlir_float16_utils.so.17git
+%%MLIR%%llvm%%LLVM_SUFFIX%%/lib/libmlir_float16_utils.so.17-rc2
 %%MLIR%%llvm%%LLVM_SUFFIX%%/lib/libmlir_runner_utils.so
-%%MLIR%%llvm%%LLVM_SUFFIX%%/lib/libmlir_runner_utils.so.17git
+%%MLIR%%llvm%%LLVM_SUFFIX%%/lib/libmlir_runner_utils.so.17-rc2
 %%OPENMP%%llvm%%LLVM_SUFFIX%%/lib/libomp.so
 %%OPENMP%%llvm%%LLVM_SUFFIX%%/lib/libomptarget.so
-%%OPENMP%%llvm%%LLVM_SUFFIX%%/lib/libomptarget.so.17git
+%%OPENMP%%llvm%%LLVM_SUFFIX%%/lib/libomptarget.so.17-rc2
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libscanbuild/__init__.py
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libscanbuild/analyze.py
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libscanbuild/arguments.py



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202308091743.379HhlVQ059535>