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.

Sign up for GitHub

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

Jump to bottom

Correct failure of netty build component on s390x (due to zip -qd needing something to delete) #10643

Closed
wants to merge 2 commits into from
Closed

Correct failure of netty build component on s390x (due to zip -qd needing something to delete) #10643

wants to merge 2 commits into from

Conversation

jonpspri
Copy link
Contributor

Build on s390x fails because the process to remove unnecessary libraries from netty was not configured for x86. As a result, zip -d failed because it had nothing to remove. This PR does two things:

  1. Adds conditions for s390x to the src and third_party BUILD files, and
  2. Adds a condition to the genrule so that 'zip -d' does not execute if there's nothing to do.

See also Issue #9263; Pull Requests #9346 and #9945

@jonpspri jonpspri marked this pull request as ready for review January 24, 2020 10:11
@jonpspri jonpspri changed the title S390x Correct failure of netty build component on s390x (due to zip -qd needing something to delete) Jan 24, 2020
@irengrig irengrig added the team-Configurability platforms, toolchains, cquery, select(), config transitions label Feb 3, 2020
@gregestren
Copy link
Contributor

Jonathan,

It looks like we have to follow a different merge process for patches that include third_party. I can merge src/conditions/BUILD in this PR, then we'll need a separate PR just for third_party/BUILD.

Does that ordering sequence work and do you mind setting up the PR structure that way?

@jonpspri
Copy link
Contributor Author

@gregestren Yes, that works. Go ahead and merge src/conditions/BUILD from this PR. Once it's in place and percolated through, I'll open a new PR for third_party/BUILD. It looks like there's a conflict there to resolve anyway.

Do I need to undo the third_party/BUILD changes in this branch for that to work?

@gregestren
Copy link
Contributor

I believe it's okay as-is. I'll try to merge - I'll add a comment here if anything doesn't work.

@bazel-io bazel-io closed this in 07b6247 Feb 12, 2020
@gregestren
Copy link
Contributor

This patch is in - ready for third_party/BUILD when you are.

@jonpspri
Copy link
Contributor Author

@gregestren Perfect. I'll rebase and submit a new pull request later today. Kinda busy doing my "real job" this morning.

@jonpspri jonpspri mentioned this pull request Feb 15, 2020
Closed
bazel-io pushed a commit that referenced this pull request Feb 17, 2020
@jonpspri @philwo
Add s390x and make zip -d step more resilient
ab62a6e 
Continuation of PR #10643 for application to third_party directory

Build on s390x fails because the process to remove unnecessary libraries from netty was not configured for x86. As a result, zip -d failed because it had nothing to remove. This PR does two things:

Adds conditions for s390x to the src and third_party BUILD files, and
Adds a condition to the genrule so that 'zip -d' does not execute if there's nothing to do.

See also Issue #9263; Pull Requests #9346 and #9945

Closes #10798.

Signed-off-by: Philipp Wollermann <philwo@google.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@gregestren gregestren gregestren approved these changes

Assignees

@gregestren gregestren

Labels
cla: yes team-Configurability platforms, toolchains, cquery, select(), config transitions
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@jonpspri @gregestren @googlebot @irengrig