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

[bazel] Add fixes for --incompatible_load_{cc,java,proto}_rules_from_bzl (Part 2) #6445

Merged

Conversation

Yannic
Copy link
Contributor

@Yannic Yannic commented Jul 26, 2019

This change adds the required loads to examples and zlib. Sorry for missing them in the first PR.
For full compatibility with --incompatible_load_{cc,java,proto}_rules_from_bzl,
we will need to roll gtest to a newer version.

@@ -5,6 +5,14 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
def protobuf_deps():
"""Loads common dependencies needed to compile the protobuf library."""

if not native.existing_rule("zlib"):
Copy link
Member

Choose a reason for hiding this comment

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

Should this be "bazel_skylib" here instead of "zlib"?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Indeed.

@Yannic Yannic force-pushed the fix_incompatible_load_part_2 branch from 7b54c9a to 14228d5 Compare July 26, 2019 19:20
Copy link
Contributor Author

@Yannic Yannic left a comment

Choose a reason for hiding this comment

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

Thanks for your review! ptal

@@ -5,6 +5,14 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
def protobuf_deps():
"""Loads common dependencies needed to compile the protobuf library."""

if not native.existing_rule("zlib"):
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Indeed.

@acozzette
Copy link
Member

I think to make the tests happy you will have to remove examples/third_party/zlib.BUILD from Makefile.am.

…bzl (Part 2)

This change adds the required loads to examples and zlib.
For full compatibility with --incompatible_load_{cc,java,proto}_rules_from_bzl,
we will need to roll gtest to a newer version.
@Yannic Yannic force-pushed the fix_incompatible_load_part_2 branch from 14228d5 to 7911b18 Compare July 28, 2019 07:19
@Yannic
Copy link
Contributor Author

Yannic commented Jul 28, 2019

Thanks for saving me time to figure that out!

Yannic added a commit to Yannic/bazel that referenced this pull request Jul 28, 2019
@acozzette acozzette merged commit bf0c69e into protocolbuffers:master Jul 29, 2019
Yannic added a commit to Yannic/bazel that referenced this pull request Aug 6, 2019
Yannic added a commit to Yannic/bazel that referenced this pull request Aug 6, 2019
Yannic added a commit to Yannic/bazel that referenced this pull request Aug 6, 2019
bazel-io pushed a commit to bazelbuild/bazel that referenced this pull request Aug 7, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants