deps: Bump org_llvm_llvm -> 12.0.1, com_github_wavm_wavm -> 9ffd3e2#18747
Merged
phlax merged 4 commits intoenvoyproxy:mainfrom Oct 28, 2021
Merged
deps: Bump org_llvm_llvm -> 12.0.1, com_github_wavm_wavm -> 9ffd3e2#18747phlax merged 4 commits intoenvoyproxy:mainfrom
org_llvm_llvm -> 12.0.1, com_github_wavm_wavm -> 9ffd3e2#18747phlax merged 4 commits intoenvoyproxy:mainfrom
Conversation
Signed-off-by: Ryan Northey <ryan@synca.io>
repokitteh-read-only
bot
added
the
deps
Member
Author
PiotrSikora
suggested changes
Oct 25, 2021
Signed-off-by: Ryan Northey <ryan@synca.io>
phlax
force-pushed
the
deps-bump-wavm-llvm
branch
from
42cff95 to
28e9627
Compare
phlax
commented
Oct 26, 2021
Member
Author
|
still (or now) failing with |
PiotrSikora
suggested changes
Oct 26, 2021
Contributor
PiotrSikora
left a comment
PiotrSikora
left a comment
There was a problem hiding this comment.
still (or now) failing with
ERROR: /build/tmp/_bazel_envoybuild/400406edc57d332f0b9b805d2b8e33a1/external/envoy/bazel/foreign_cc/BUILD:239:12: output 'external/envoy/bazel/foreign_cc/llvm/lib/libPolly.a' was not created ERROR: /build/tmp/_bazel_envoybuild/400406edc57d332f0b9b805d2b8e33a1/external/envoy/bazel/foreign_cc/BUILD:239:12: output 'external/envoy/bazel/foreign_cc/llvm/lib/libPollyISL.a' was not created ERROR: /build/tmp/_bazel_envoybuild/400406edc57d332f0b9b805d2b8e33a1/external/envoy/bazel/foreign_cc/BUILD:239:12: Foreign Cc - CMake: Building llvm failed: not all outputs were created or valid
Apply this patch to fix it (tested with both: WAVM and WAMR):
--- a/bazel/foreign_cc/BUILD
+++ b/bazel/foreign_cc/BUILD
@@ -289,33 +289,57 @@ envoy_cmake(
# ...inside the `envoy-build-ubuntu` image - this assumes a build image
# with the correct/updated llvm version.
#
+ "libLLVMWindowsManifest.a",
+ "libLLVMXRay.a",
+ "libLLVMLibDriver.a",
+ "libLLVMDlltoolDriver.a",
+ "libLLVMCoverage.a",
+ "libLLVMLineEditor.a",
+ "libLLVMX86Disassembler.a",
"libLLVMX86AsmParser.a",
+ "libLLVMX86CodeGen.a",
"libLLVMX86Desc.a",
"libLLVMX86Info.a",
- "libLLVMMCDisassembler.a",
"libLLVMOrcJIT.a",
+ "libLLVMMCJIT.a",
"libLLVMJITLink.a",
"libLLVMOrcTargetProcess.a",
"libLLVMOrcShared.a",
- "libLLVMMIRParser.a",
+ "libLLVMInterpreter.a",
+ "libLLVMExecutionEngine.a",
+ "libLLVMRuntimeDyld.a",
+ "libLLVMSymbolize.a",
+ "libLLVMDebugInfoPDB.a",
+ "libLLVMDebugInfoGSYM.a",
+ "libLLVMOption.a",
+ "libLLVMObjectYAML.a",
+ "libLLVMMCA.a",
+ "libLLVMMCDisassembler.a",
"libLLVMLTO.a",
- "libLLVMExtensions.a",
- "libPolly.a",
- "libPollyISL.a",
"libLLVMPasses.a",
+ "libLLVMCFGuard.a",
+ "libLLVMCoroutines.a",
"libLLVMObjCARCOpts.a",
"libLLVMHelloNew.a",
- "libLLVMCoroutines.a",
"libLLVMipo.a",
- "libLLVMInstrumentation.a",
"libLLVMVectorize.a",
"libLLVMLinker.a",
- "libLLVMIRReader.a",
+ "libLLVMInstrumentation.a",
"libLLVMFrontendOpenMP.a",
- "libLLVMInterpreter.a",
- "libLLVMExecutionEngine.a",
- "libLLVMRuntimeDyld.a",
+ "libLLVMFrontendOpenACC.a",
+ "libLLVMExtensions.a",
+ "libLLVMDWARFLinker.a",
+ "libLLVMGlobalISel.a",
+ "libLLVMMIRParser.a",
+ "libLLVMAsmPrinter.a",
+ "libLLVMDebugInfoDWARF.a",
+ "libLLVMSelectionDAG.a",
"libLLVMCodeGen.a",
+ "libLLVMIRReader.a",
+ "libLLVMAsmParser.a",
+ "libLLVMInterfaceStub.a",
+ "libLLVMFileCheck.a",
+ "libLLVMFuzzMutate.a",
"libLLVMTarget.a",
"libLLVMScalarOpts.a",
"libLLVMInstCombine.a",
@@ -324,7 +348,6 @@ envoy_cmake(
"libLLVMBitWriter.a",
"libLLVMAnalysis.a",
"libLLVMProfileData.a",
- "libLLVMDebugInfoDWARF.a",
"libLLVMObject.a",
"libLLVMTextAPI.a",
"libLLVMMCParser.a",
@@ -332,11 +355,11 @@ envoy_cmake(
"libLLVMDebugInfoCodeView.a",
"libLLVMDebugInfoMSF.a",
"libLLVMBitReader.a",
- "libLLVMAsmParser.a",
"libLLVMCore.a",
"libLLVMRemarks.a",
"libLLVMBitstreamReader.a",
"libLLVMBinaryFormat.a",
Signed-off-by: Ryan Northey <ryan@synca.io>
Signed-off-by: Ryan Northey <ryan@synca.io>
Member
Author
@PiotrSikora thanks, applied
i have simplified/updated the message about regenerating this list - lmk if this is more accurate |
PiotrSikora
approved these changes
Oct 27, 2021
Contributor
PiotrSikora
left a comment
PiotrSikora
left a comment
There was a problem hiding this comment.
LGTM, thanks!
Note: compile_time_options timeouts and coverage fails for some reason.
Contributor
|
/retest |
|
Retrying Azure Pipelines: |
Contributor
|
/LGTM deps Thanks! |
Contributor
|
/lgtm deps |
repokitteh-read-only
bot
removed
the
deps
Member
Author
|
@wrowe can i get a maintainer stamp please |
wrowe
approved these changes
Oct 28, 2021
Contributor
wrowe
left a comment
wrowe
left a comment
There was a problem hiding this comment.
Looks correct, Linux side anyways. This may cause some chaos with mobile, win32 etc, we have to see if this is shared on those platforms.
Member
Author
|
i think it at least gives us consistency with llvm used elsewhere |
mpuncel
added a commit
to mpuncel/envoy
that referenced
this pull request
Oct 29, 2021
* main: (221 commits) deps: Bump `protobuf` -> 3.19.0 (envoyproxy#18471) tooling: auto-assign dependency shephards (envoyproxy#18794) clang-tidy: Return from diff fun if empty diff (envoyproxy#18815) repokitteh: Block PRs pending deps approval (envoyproxy#18814) deps: Bump `org_llvm_llvm` -> 12.0.1, `com_github_wavm_wavm` -> 9ffd3e2 (envoyproxy#18747) dns resolvers: add All lookup mode (envoyproxy#18464) doc: fix link formatting for TLS session_timeout (envoyproxy#18790) ext_authz: Set response flag and code details to UAEX when denied (envoyproxy#18740) socket options: add support for directly creating ipv4/ipv6 pairs (envoyproxy#18769) ecds: make onConfigUpdate generic over filter type (envoyproxy#18061) bazel: update CMake instructions in EXTERNAL_DEPS.md (envoyproxy#18799) upstream: fix typo in comment (envoyproxy#18798) runtime: removing envoy.reloadable_features.grpc_json_transcoder_adhere_to_buffer_limits (envoyproxy#18696) bazel: Add CC=clang to clang configuration (envoyproxy#18732) fix error request id in the dubbbo local reply (envoyproxy#18741) event: assert the case of both read and closed event registered (envoyproxy#18265) tcp proxy connect tunneling: improved testing (envoyproxy#18784) deps: Bump `protoc-gen-validate` -> 0.6.2 (envoyproxy#18742) deps: Bump `rules_pkg` -> ad57589 (envoyproxy#18746) bazel: copy .bazelversion for envoy filter examples (envoyproxy#18730) ... Signed-off-by: Michael Puncel <mpuncel@squareup.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Signed-off-by: Ryan Northey ryan@synca.io
Commit Message:
Additional Description:
Following up on comments:
#18521 (comment)
#15021 (comment)
Risk Level:
Testing:
Docs Changes:
Release Notes:
Platform Specific Features:
[Optional Runtime guard:]
[Optional Fixes #Issue]
[Optional Fixes commit #PR or SHA]
[Optional Deprecated:]
[Optional API Considerations:]