Skip to content

Commit

Permalink
devel/llvm-devel: Update to new snapshot
Browse files Browse the repository at this point in the history 
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.
  • Loading branch information
@brooksdavis
brooksdavis committed Jan 12, 2023
1 parent 79aeb73 commit 7e787f8
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 7 deletions.
5 changes: 3 additions & 2 deletions devel/llvm-devel/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down Expand Up @@ -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 \
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions devel/llvm-devel/Makefile.snapshot
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
6 changes: 3 additions & 3 deletions devel/llvm-devel/distinfo
View file
Original file line number Diff line number Diff line change
@@ -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
4 changes: 4 additions & 0 deletions devel/llvm-devel/pkg-plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 7e787f8

Please sign in to comment.