aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrooks Davis <brooks@FreeBSD.org>2023-01-12 22:49:23 +0000
committerBrooks Davis <brooks@FreeBSD.org>2023-01-12 22:58:52 +0000
commit7e787f8d24244bcd7ece5dd7b9802e9fa1217a05 (patch)
treea392e035acaf34a78cbeb3b3379ea11787e0e5ff
parent79aeb739c50106148b1b8bf5f84a9b203f4d7fe8 (diff)
downloadports-7e787f8d24244bcd7ece5dd7b9802e9fa1217a05.tar.gz
ports-7e787f8d24244bcd7ece5dd7b9802e9fa1217a05.zip
devel/llvm-devel: Update to new snapshot
Also disable OpenMP runtime on 12. It fails to compile with: /wrkdirs/usr/ports/devel/llvm-devel/work-default/llvm-project-6df5464a463b8ada2df167595286aa2b6510dd16/openmp/libomptarget/plugins-nextgen/common/PluginInterface/PluginInterface.cpp:425:14: error: call to deleted constructor of 'llvm::Error' return Err; ^~~ /wrkdirs/usr/ports/devel/llvm-devel/work-default/llvm-project-6df5464a463b8ada2df167595286aa2b6510dd16/llvm/include/llvm/Support/Error.h:185:3: note: 'Error' has been explicitly marked deleted here Error(const Error &Other) = delete; ^ /wrkdirs/usr/ports/devel/llvm-devel/work-default/llvm-project-6df5464a463b8ada2df167595286aa2b6510dd16/llvm/include/llvm/Support/Error.h:492:18: note: passing argument to parameter 'Err' here Expected(Error Err) ^ 1 error generated.
-rw-r--r--devel/llvm-devel/Makefile5
-rw-r--r--devel/llvm-devel/Makefile.snapshot4
-rw-r--r--devel/llvm-devel/distinfo6
-rw-r--r--devel/llvm-devel/pkg-plist4
4 files changed, 12 insertions, 7 deletions
diff --git a/devel/llvm-devel/Makefile b/devel/llvm-devel/Makefile
index d7c02d10e4ed..5e5806bcf893 100644
--- a/devel/llvm-devel/Makefile
+++ b/devel/llvm-devel/Makefile
@@ -31,7 +31,7 @@ DATADIR= ${PREFIX}/share/${PORTNAME}${LLVM_SUFFIX}
BUILD_DEPENDS=
-USES= cmake compiler:c++11-lib cpe shebangfix
+USES= cmake compiler:c++17-lang cpe shebangfix
USE_LDCONFIG= ${LLVM_PREFIX}/lib
_USES_PYTHON?= python:build,3.6+
USES+= ${_USES_PYTHON}
@@ -100,6 +100,7 @@ OPTIONS_EXCLUDE_armv7= COMPILER_RT FLANG OPENMP
OPTIONS_EXCLUDE_i386= FLANG OPENMP
OPTIONS_EXCLUDE_powerpc= FLANG OPENMP
OPTIONS_EXCLUDE_riscv64= LLDB
+OPTIONS_EXCLUDE_FreeBSD_12= OPENMP
.endif
OPTIONS_SUB= yes
_ALL_OPTIONS= CLANG COMPILER_RT DOCS EXTRAS FLANG GOLD LIT LLD LLDB MLIR \
@@ -421,7 +422,7 @@ post-install-FLANG-on:
${RMDIR} ${STAGEDIR}${LLVM_PREFIX}/include/flang/Optimizer/Transforms/CMakeFiles
${RMDIR} ${STAGEDIR}${LLVM_PREFIX}/include/flang/Optimizer/CMakeFiles
${RMDIR} ${STAGEDIR}${LLVM_PREFIX}/include/flang/CMakeFiles
-.if ${SNAPDATE} == 20230103
+.if ${SNAPDATE} == 20230109
# expected to be temporary
${LN} -f ${STAGEDIR}${LLVM_PREFIX}/bin/flang-new \
${STAGEDIR}${LLVM_PREFIX}/bin/flang
diff --git a/devel/llvm-devel/Makefile.snapshot b/devel/llvm-devel/Makefile.snapshot
index 36c627228ff5..1609c6cf97db 100644
--- a/devel/llvm-devel/Makefile.snapshot
+++ b/devel/llvm-devel/Makefile.snapshot
@@ -4,6 +4,6 @@
#
LLVM_MAJOR= 16
LLVM_RELEASE= ${LLVM_MAJOR}.0.0
-SNAPDATE= 20230103
+SNAPDATE= 20230109
-LLVM_PROJECT_COMMIT= 6df5464a463b8ada2df167595286aa2b6510dd16
+LLVM_PROJECT_COMMIT= 596c5581556cbd4103d982066fb76e745fb8480e
diff --git a/devel/llvm-devel/distinfo b/devel/llvm-devel/distinfo
index feb468221c48..c14a5c4e91a7 100644
--- a/devel/llvm-devel/distinfo
+++ b/devel/llvm-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1672784724
-SHA256 (llvm-llvm-project-16.0.d20230103-6df5464a463b8ada2df167595286aa2b6510dd16_GH0.tar.gz) = ceee6a7a978aef2a53bf0f58e059c734077a972ec5c5aacd415b6b96af3c0087
-SIZE (llvm-llvm-project-16.0.d20230103-6df5464a463b8ada2df167595286aa2b6510dd16_GH0.tar.gz) = 175051659
+TIMESTAMP = 1673306354
+SHA256 (llvm-llvm-project-16.0.d20230109-596c5581556cbd4103d982066fb76e745fb8480e_GH0.tar.gz) = 190bef711d40fd23f8aebdacf9a3bcbfc64687c3f075a8a9e56dc137e0415d40
+SIZE (llvm-llvm-project-16.0.d20230109-596c5581556cbd4103d982066fb76e745fb8480e_GH0.tar.gz) = 175280874
diff --git a/devel/llvm-devel/pkg-plist b/devel/llvm-devel/pkg-plist
index bde38e9054fb..547cef1b4369 100644
--- a/devel/llvm-devel/pkg-plist
+++ b/devel/llvm-devel/pkg-plist
@@ -454,6 +454,7 @@ llvm-devel/bin/verify-uselistorder
%%EXTRAS%%llvm-devel/include/clang-tidy/cppcoreguidelines/AvoidDoWhileCheck.h
%%EXTRAS%%llvm-devel/include/clang-tidy/cppcoreguidelines/AvoidGotoCheck.h
%%EXTRAS%%llvm-devel/include/clang-tidy/cppcoreguidelines/AvoidNonConstGlobalVariablesCheck.h
+%%EXTRAS%%llvm-devel/include/clang-tidy/cppcoreguidelines/AvoidReferenceCoroutineParametersCheck.h
%%EXTRAS%%llvm-devel/include/clang-tidy/cppcoreguidelines/InitVariablesCheck.h
%%EXTRAS%%llvm-devel/include/clang-tidy/cppcoreguidelines/InterfacesGlobalInitCheck.h
%%EXTRAS%%llvm-devel/include/clang-tidy/cppcoreguidelines/MacroUsageCheck.h
@@ -4050,6 +4051,7 @@ llvm-devel/include/llvm/XRay/YAMLXRayRecord.h
%%MLIR%%llvm-devel/include/mlir/Analysis/Presburger/SlowMPInt.h
%%MLIR%%llvm-devel/include/mlir/Analysis/Presburger/Utils.h
%%MLIR%%llvm-devel/include/mlir/Analysis/SliceAnalysis.h
+%%MLIR%%llvm-devel/include/mlir/Analysis/SymbolTableAnalysis.h
%%MLIR%%llvm-devel/include/mlir/AsmParser/AsmParser.h
%%MLIR%%llvm-devel/include/mlir/AsmParser/AsmParserState.h
%%MLIR%%llvm-devel/include/mlir/AsmParser/CodeComplete.h
@@ -4706,6 +4708,7 @@ llvm-devel/include/llvm/XRay/YAMLXRayRecord.h
%%MLIR%%llvm-devel/include/mlir/Dialect/SPIRV/Transforms/Passes.h.inc
%%MLIR%%llvm-devel/include/mlir/Dialect/SPIRV/Transforms/Passes.td
%%MLIR%%llvm-devel/include/mlir/Dialect/SPIRV/Transforms/SPIRVConversion.h
+%%MLIR%%llvm-devel/include/mlir/Dialect/SPIRV/Transforms/SPIRVWebGPUTransforms.h
%%MLIR%%llvm-devel/include/mlir/Dialect/SPIRV/Utils/LayoutUtils.h
%%MLIR%%llvm-devel/include/mlir/Dialect/Shape/Analysis/ShapeMappingAnalysis.h
%%MLIR%%llvm-devel/include/mlir/Dialect/Shape/IR/Shape.h
@@ -4820,6 +4823,7 @@ llvm-devel/include/llvm/XRay/YAMLXRayRecord.h
%%MLIR%%llvm-devel/include/mlir/Dialect/Transform/Transforms/Passes.h
%%MLIR%%llvm-devel/include/mlir/Dialect/Transform/Transforms/Passes.h.inc
%%MLIR%%llvm-devel/include/mlir/Dialect/Transform/Transforms/Passes.td
+%%MLIR%%llvm-devel/include/mlir/Dialect/Transform/Utils/DiagnosedSilenceableFailure.h
%%MLIR%%llvm-devel/include/mlir/Dialect/Transform/Utils/Utils.h
%%MLIR%%llvm-devel/include/mlir/Dialect/Utils/DialectUtilsEnums.cpp.inc
%%MLIR%%llvm-devel/include/mlir/Dialect/Utils/DialectUtilsEnums.h.inc