Skip to content

fix build on ppc64le #8141

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
Merged
sanjaypujare merged 5 commits into from
Jun 7, 2021
Merged

fix build on ppc64le #8141

sanjaypujare merged 5 commits into from
Jun 7, 2021

Conversation

@shirodkara
Copy link
Contributor

@shirodkara shirodkara commented May 4, 2021

This fixes build on ppc64le on RHEL8 . As referenced in #7757

@linux-foundation-easycla
Copy link

linux-foundation-easycla bot commented May 4, 2021 •
edited
Loading

CLA Signed

The committers are authorized under a signed CLA.

@shirodkara shirodkara mentioned this pull request May 28, 2021
Closed
sanjaypujare
sanjaypujare reviewed May 29, 2021
View reviewed changes
compiler/build.gradle Outdated
linker.args "-static", "-lprotoc", "-lprotobuf", "-static-libgcc", "-static-libstdc++",
"-s"
} else {
}else if (System.getProperty('os.arch').contains('ppc64')){
Copy link
Contributor

@sanjaypujare sanjaypujare May 29, 2021

Choose a reason for hiding this comment

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

why not use osdetector.arch instead of System.getProperty('os.arch')? Also indent/format needs to be consistent

Copy link
Contributor Author

@shirodkara shirodkara Jun 3, 2021

Choose a reason for hiding this comment

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

@sanjaypujare I have made the change to use osdetector.arch as suggested. Thanks

sanjaypujare
sanjaypujare reviewed Jun 3, 2021
View reviewed changes
compiler/build.gradle Outdated
"-s"
} else {
} else if (osdetector.arch == "ppcle_64") {
linker.args "-Wl,-Bstatic", "-lprotoc", "-lprotobuf", "-Wl,-Bdynamic", "-lpthread", "-s"
Copy link
Contributor

@sanjaypujare sanjaypujare Jun 3, 2021

Choose a reason for hiding this comment

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

Pls align the linker.args... statement with the one on line 101 to start at the same column

Copy link
Contributor Author

@shirodkara shirodkara Jun 4, 2021

Choose a reason for hiding this comment

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

@sanjaypujare have fixed these too, thanks .

sanjaypujare
sanjaypujare reviewed Jun 3, 2021
View reviewed changes
compiler/build.gradle Outdated
} else {
} else if (osdetector.arch == "ppcle_64") {
linker.args "-Wl,-Bstatic", "-lprotoc", "-lprotobuf", "-Wl,-Bdynamic", "-lpthread", "-s"
}else {
Copy link
Contributor

@sanjaypujare sanjaypujare Jun 3, 2021

Choose a reason for hiding this comment

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

Space before else so it is

} else {

sanjaypujare
sanjaypujare suggested changes Jun 3, 2021
View reviewed changes
Copy link
Contributor

@sanjaypujare sanjaypujare left a comment

Choose a reason for hiding this comment

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

Couple of comments left

sanjaypujare
sanjaypujare reviewed Jun 4, 2021
View reviewed changes
compiler/build.gradle Outdated
} else {
} else if (osdetector.arch == "ppcle_64") {
linker.args "-Wl,-Bstatic", "-lprotoc", "-lprotobuf", "-Wl,-Bdynamic", "-lpthread", "-s"
} else {
Copy link
Contributor

@sanjaypujare sanjaypujare Jun 4, 2021

Choose a reason for hiding this comment

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

The indentation is still incorrect. Ideally it should show only 2 lines added before line 103 but because of your changes it shows deleting line 103 and adding 3 lines (103-105). Because of mismatched indentation the else clause also aligns with the wrong if clause. Take a look at the diff shown by github and you will see.

Copy link
Contributor Author

@shirodkara shirodkara Jun 7, 2021

Choose a reason for hiding this comment

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

Hi @sanjaypujare does it look okay now with the current indentation ?

Copy link
Contributor

@sanjaypujare sanjaypujare Jun 7, 2021

Choose a reason for hiding this comment

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

Yes. Merged already

Copy link
Contributor Author

@shirodkara shirodkara Jun 7, 2021

Choose a reason for hiding this comment

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

thanks @sanjaypujare

@sanjaypujare sanjaypujare added the kokoro:force-run Add this label to a PR to tell Kokoro to re-run all tests. Not generally necessary label Jun 4, 2021
@grpc-kokoro grpc-kokoro removed the kokoro:force-run Add this label to a PR to tell Kokoro to re-run all tests. Not generally necessary label Jun 4, 2021
@sanjaypujare sanjaypujare added the kokoro:force-run Add this label to a PR to tell Kokoro to re-run all tests. Not generally necessary label Jun 7, 2021
@grpc-kokoro grpc-kokoro removed the kokoro:force-run Add this label to a PR to tell Kokoro to re-run all tests. Not generally necessary label Jun 7, 2021
@sanjaypujare sanjaypujare merged commit a6d78c5 into grpc:master Jun 7, 2021
@afsanjar afsanjar mentioned this pull request Aug 25, 2021
Merged
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Sep 6, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

1 more reviewer

@sanjaypujare sanjaypujare sanjaypujare approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@shirodkara @sanjaypujare @grpc-kokoro