Merged
Conversation
repokitteh-read-only
bot
added
the
deps
|
CC @envoyproxy/dependency-shepherds: Your approval is needed for changes made to |
Contributor
|
Confirm, it does complete on M1-Pro, with golang set to 1.17 |
Member
Author
|
/retest |
|
Retrying Azure Pipelines: |
It seems that some combination of macOS Monterey and Xcode 13 started causing a build issue. The problem is that `mach/boolean.h` adds macros for `TRUE` and `FALSE` which conflicts with some of Envoy's own uses of these. We never import this directly so it's possible these macros are not new, but just exposed through headers in a new way. The core fix here is to patch cel-cpp working around google/cel-cpp#121 The secondary fix is to remove this macro as envoy already did for windows. This stops any code that imports the platform header from hitting this in the future. This fixes: envoyproxy#18842 Signed-off-by: Keith Smiley <[email protected]>
keith
force-pushed
the
ks/bazel-fix-macos-build
branch
from
2a5933a to
f026826
Compare
Contributor
|
@moderation can you LGTM deps, please? |
Contributor
|
/lgtm deps |
repokitteh-read-only
bot
removed
the
deps
yanavlasov
approved these changes
Nov 10, 2021
mpuncel
added a commit
to mpuncel/envoy
that referenced
this pull request
Nov 10, 2021
* main: (71 commits) bazel: fix macOS build (envoyproxy#18920) http: switching from 100 to 1xx (envoyproxy#18904) grpc: implement BufferedAsyncClient for bidirectional gRPC stream (envoyproxy#18129) bazel: add repository arg to benchmark_test (envoyproxy#18795) rocketmq_proxy: Improvement for map find (envoyproxy#18909) tls: unit test: spiffe signed by intermediate cert (envoyproxy#18914) Test for FilterConfigPerRoute dtor called on worker thread. (envoyproxy#18927) deps: Bump `com_google_protobuf` -> 3.19.1 (envoyproxy#18930) deps: Bump `com_googlesource_code_re2` -> 2021-11-01 (envoyproxy#18933) cvescan: Move cvescan data to yaml (envoyproxy#18947) remove unnecessary file level not unimplemented hide annotation (envoyproxy#18924) test: moving echo test (envoyproxy#18938) test: fixing a test flake (envoyproxy#18899) deps: Revert pyparsing bump (envoyproxy#18946) deps: Bump `build_bazel_rules_apple` -> 0.32.0 (envoyproxy#18932) deps: Bump `com_github_bazelbuild_buildtools` -> 4.2.3 (envoyproxy#18931) build(deps): bump pycparser from 2.20 to 2.21 in /tools/dependency (envoyproxy#18936) quic: supporting connections with zero initial available streams (envoyproxy#18775) test: moving proxy proto (envoyproxy#18939) build(deps): bump pyparsing from 3.0.4 to 3.0.5 in /tools/dependency (envoyproxy#18937) ... Signed-off-by: Michael Puncel <[email protected]>
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
5 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.
It seems that some combination of macOS Monterey and Xcode 13 started
causing a build issue. The problem is that
mach/boolean.hadds macrosfor
TRUEandFALSEwhich conflicts with some of Envoy's own uses ofthese. We never import this directly so it's possible these macros are
not new, but just exposed through headers in a new way.
The core fix here is to update cel-cpp to fix google/cel-cpp#121
The secondary fix is to remove this macro as envoy already did for
windows. This stops any code that imports the platform header from
hitting this in the future.
This fixes: #18842
Signed-off-by: Keith Smiley [email protected]