git: a5942ffe5a0c - main - devel/llvm-devel: new snapshot, plist fix
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 22 Jul 2024 18:52:39 UTC
The branch main has been updated by brooks:
URL: https://cgit.FreeBSD.org/ports/commit/?id=a5942ffe5a0c6202869972fca3f1ad8f2dc37fb7
commit a5942ffe5a0c6202869972fca3f1ad8f2dc37fb7
Author: Brooks Davis <brooks@FreeBSD.org>
AuthorDate: 2024-07-22 18:50:50 +0000
Commit: Brooks Davis <brooks@FreeBSD.org>
CommitDate: 2024-07-22 18:52:27 +0000
devel/llvm-devel: new snapshot, plist fix
Fix plists without FLANG enabled. This broke i386 builds among others.
Sponsored by: DARPA, AFRL
---
devel/llvm-devel/Makefile | 2 +-
devel/llvm-devel/Makefile.snapshot | 4 ++--
devel/llvm-devel/distinfo | 6 +++---
devel/llvm-devel/pkg-plist | 7 +++++--
4 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/devel/llvm-devel/Makefile b/devel/llvm-devel/Makefile
index 1b6a39c74d2a..f12aafc91bb5 100644
--- a/devel/llvm-devel/Makefile
+++ b/devel/llvm-devel/Makefile
@@ -217,7 +217,7 @@ EXTRAS_LIBS= \
EXTRAS_FILES= index.js
EXTRAS_PATTERN= ${EXTRAS_COMMANDS:tW:C/ */|/g}|${EXTRAS_LIBS:tW:C/ */|/g}|${EXTRAS_FILES:tW:C/ */|/g}
-FLANG_PATTERN= ${FLANG_COMMANDS:S/^/bin./:tW:C/ */|/g}|flang|libFIR|libFortran|libHLFIR|ISO_Fortran_binding.h
+FLANG_PATTERN= ${FLANG_COMMANDS:S/^/bin./:tW:C/ */|/g}|flang|libCUF|libFIR|libFortran|libHLFIR|ISO_Fortran_binding.h
MLIR_PATTERN= ${MLIR_COMMANDS:S/^/bin./:tW:C/ */|/g}|mlir|libMLIR|obj.MLIRCAP
diff --git a/devel/llvm-devel/Makefile.snapshot b/devel/llvm-devel/Makefile.snapshot
index d1488083ce1c..7afabab8dfea 100644
--- a/devel/llvm-devel/Makefile.snapshot
+++ b/devel/llvm-devel/Makefile.snapshot
@@ -4,6 +4,6 @@
#
LLVM_MAJOR= 19
LLVM_RELEASE= ${LLVM_MAJOR}.0.0
-SNAPDATE= 20240718
+SNAPDATE= 20240722
-LLVM_PROJECT_COMMIT= 9527d77aefcf214944a4c8bd284dde3ffe9dff60
+LLVM_PROJECT_COMMIT= fa5971c298c96c965ba6d8fb855867f23518aad4
diff --git a/devel/llvm-devel/distinfo b/devel/llvm-devel/distinfo
index 67963b93f632..31d2b90b4033 100644
--- a/devel/llvm-devel/distinfo
+++ b/devel/llvm-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1721327636
-SHA256 (llvm-llvm-project-19.0.d20240718-9527d77aefcf214944a4c8bd284dde3ffe9dff60_GH0.tar.gz) = 49d84923a985bf423a5d10dd7efeea233200b67fd32cbba55dba43c753111e25
-SIZE (llvm-llvm-project-19.0.d20240718-9527d77aefcf214944a4c8bd284dde3ffe9dff60_GH0.tar.gz) = 217218529
+TIMESTAMP = 1721669662
+SHA256 (llvm-llvm-project-19.0.d20240722-fa5971c298c96c965ba6d8fb855867f23518aad4_GH0.tar.gz) = 753eb80b65a173bf8788dbc2a9af7c5ba9cee688f561ecb431b29a5ac1154b6c
+SIZE (llvm-llvm-project-19.0.d20240722-fa5971c298c96c965ba6d8fb855867f23518aad4_GH0.tar.gz) = 217389507
diff --git a/devel/llvm-devel/pkg-plist b/devel/llvm-devel/pkg-plist
index d68daaf7bf8b..dfd8f6ee24b2 100644
--- a/devel/llvm-devel/pkg-plist
+++ b/devel/llvm-devel/pkg-plist
@@ -1852,6 +1852,7 @@ llvm-devel/bin/verify-uselistorder
%%FLANG%%llvm-devel/include/flang/ieee_features.mod
%%FLANG%%llvm-devel/include/flang/iso_c_binding.mod
%%FLANG%%llvm-devel/include/flang/iso_fortran_env.mod
+%%FLANG%%llvm-devel/include/flang/iso_fortran_env_impl.mod
%%FLANG%%llvm-devel/include/flang/mma.mod
%%FLANG%%%%OPENMP%%llvm-devel/include/flang/omp_lib.f18.mod
%%FLANG%%%%OPENMP%%llvm-devel/include/flang/omp_lib.mod
@@ -1920,6 +1921,7 @@ llvm-devel/bin/verify-uselistorder
%%LLDB%%llvm-devel/include/lldb/API/SBQueue.h
%%LLDB%%llvm-devel/include/lldb/API/SBQueueItem.h
%%LLDB%%llvm-devel/include/lldb/API/SBReproducer.h
+%%LLDB%%llvm-devel/include/lldb/API/SBSaveCoreOptions.h
%%LLDB%%llvm-devel/include/lldb/API/SBScriptObject.h
%%LLDB%%llvm-devel/include/lldb/API/SBSection.h
%%LLDB%%llvm-devel/include/lldb/API/SBSourceManager.h
@@ -2235,6 +2237,7 @@ llvm-devel/bin/verify-uselistorder
%%LLDB%%llvm-devel/include/lldb/Symbol/ObjectContainer.h
%%LLDB%%llvm-devel/include/lldb/Symbol/ObjectFile.h
%%LLDB%%llvm-devel/include/lldb/Symbol/PostfixExpression.h
+%%LLDB%%llvm-devel/include/lldb/Symbol/SaveCoreOptions.h
%%LLDB%%llvm-devel/include/lldb/Symbol/SourceModule.h
%%LLDB%%llvm-devel/include/lldb/Symbol/Symbol.h
%%LLDB%%llvm-devel/include/lldb/Symbol/SymbolContext.h
@@ -6498,8 +6501,8 @@ llvm-devel/lib/cmake/llvm/llvm-driver-template.cpp.in
%%POLLY%%llvm-devel/lib/cmake/polly/PollyConfig.cmake
%%POLLY%%llvm-devel/lib/cmake/polly/PollyConfigVersion.cmake
%%POLLY%%llvm-devel/lib/cmake/polly/PollyExports-all.cmake
-%%STATIC_LIBS%%llvm-devel/lib/libCUFAttrs.a
-%%STATIC_LIBS%%llvm-devel/lib/libCUFDialect.a
+%%STATIC_LIBS%%%%FLANG%%llvm-devel/lib/libCUFAttrs.a
+%%STATIC_LIBS%%%%FLANG%%llvm-devel/lib/libCUFDialect.a
%%STATIC_LIBS%%%%FLANG%%llvm-devel/lib/libFIRAnalysis.a
%%STATIC_LIBS%%%%FLANG%%llvm-devel/lib/libFIRBuilder.a
%%STATIC_LIBS%%%%FLANG%%llvm-devel/lib/libFIRCodeGen.a