Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

googleurl-patch: update googleurl for new clang support #34051

Merged
merged 2 commits into from May 15, 2024

Conversation

adisuissa
Copy link
Contributor

Commit Message: googleurl-patch: update googleurl for new clang support
Additional Description:
Updating the googleurl patch file to support newer clang and C++20 requirements.
This PR is based on https://chromium.googlesource.com/chromium/src/+/9bfbbffdba73668fdb483e5a850911d2b64c35d7.

The fix should solve the oss-fuzz build failure: https://oss-fuzz-build-logs.storage.googleapis.com/log-49728383-8c45-4c65-9154-16d7440fd0bb.txt

tep #3 - "compile-honggfuzz-address-x86_64": In file included from external/com_github_google_quiche/quiche/common/test_tools/quiche_test_utils.cc:9:
Step #3 - "compile-honggfuzz-address-x86_64": In file included from external/com_github_google_quiche/quiche/common/platform/api/quiche_googleurl.h:8:
Step #3 - "compile-honggfuzz-address-x86_64": In file included from bazel-out/k8-fastbuild-ST-74a21d80f561/bin/external/com_github_google_quiche/_virtual_includes/quiche_common_platform_default_quiche_platform_impl_googleurl_impl_lib/quiche_platform_impl/quiche_googleurl_impl.h:4:
Step #3 - "compile-honggfuzz-address-x86_64": In file included from external/com_googlesource_googleurl/url/gurl.h:16:
Step #3 - "compile-honggfuzz-address-x86_64": In file included from external/com_googlesource_googleurl/base/debug/crash_logging.h:16:
Step #3 - "compile-honggfuzz-address-x86_64": In file included from external/com_googlesource_googleurl/base/strings/string_number_conversions.h:15:
Step #3 - "compile-honggfuzz-address-x86_64": In file included from external/com_googlesource_googleurl/base/containers/span.h:18:
Step #3 - "compile-honggfuzz-address-x86_64": �[1mexternal/com_googlesource_googleurl/base/containers/checked_iterators.h:242:8: �[0m�[0;1;31merror: �[0m�[1mno template named '__is_cpp17_contiguous_iterator'; did you mean '__libcpp_is_contiguous_iterator'?�[0m
Step #3 - "compile-honggfuzz-address-x86_64":   242 | struct __is_cpp17_contiguous_iterator<::gurl_base::CheckedContiguousIterator<T>>�[0m
Step #3 - "compile-honggfuzz-address-x86_64":       | �[0;1;32m       ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Step #3 - "compile-honggfuzz-address-x86_64": �[0m      | �[0;32m       __libcpp_is_contiguous_iterator
Step #3 - "compile-honggfuzz-address-x86_64": �[0m�[1m/usr/local/bin/../include/c++/v1/__iterator/iterator_traits.h:476:8: �[0m�[0;1;30mnote: �[0m'__libcpp_is_contiguous_iterator' declared here�[0m
Step #3 - "compile-honggfuzz-address-x86_64":   476 | struct __libcpp_is_contiguous_iterator : _Or<�[0m
Step #3 - "compile-honggfuzz-address-x86_64":       | �[0;1;32m       ^
Step #3 - "compile-honggfuzz-address-x86_64": �[0m1 error generated.

Risk Level: low
Testing: N/A
Docs Changes: N/A
Release Notes: N/A
Platform Specific Features: N/A

Signed-off-by: Adi Suissa-Peleg <adip@google.com>
Copy link

As a reminder, PRs marked as draft will not be automatically assigned reviewers,
or be handled by maintainer-oncall triage.

Please mark your PR as ready when you want it to be reviewed!

🐱

Caused by: #34051 was opened by adisuissa.

see: more, trace.

@repokitteh-read-only repokitteh-read-only bot added the deps Approval required for changes to Envoy's external dependencies label May 9, 2024
Copy link

CC @envoyproxy/dependency-shepherds: Your approval is needed for changes made to (bazel/.*repos.*\.bzl)|(bazel/dependency_imports\.bzl)|(api/bazel/.*\.bzl)|(.*/requirements\.txt)|(.*\.patch).
envoyproxy/dependency-shepherds assignee is @moderation

🐱

Caused by: #34051 was opened by adisuissa.

see: more, trace.

@adisuissa adisuissa marked this pull request as ready for review May 9, 2024 17:58
Signed-off-by: Adi Suissa-Peleg <adip@google.com>
@moderation
Copy link
Contributor

/lgtm deps

@repokitteh-read-only repokitteh-read-only bot removed the deps Approval required for changes to Envoy's external dependencies label May 11, 2024
@adisuissa
Copy link
Contributor Author

Assigning senior-maintainer to review
/assign @phlax

Copy link
Member

@phlax phlax left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm, thanks @adisuissa

@adisuissa adisuissa merged commit 30ecc25 into envoyproxy:main May 15, 2024
52 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants