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

Updates to better handle RISC-V cross envs and alternate OpenJDK repos #2670

Merged
merged 2 commits into from
Jul 6, 2021

Conversation

sxa
Copy link
Member

@sxa sxa commented Jul 2, 2021

A few changes here - mostly in the interests of usability of our scripts:

  • Allow cross compilation in environments other than x86-64 (NATIVE_API_ARCH variable)
  • Set BUILD_CC and BUILD_CXX for Bisheng if building natively on RISC-V
  • Abort immediately if the build JDK is not usable.
  • Allow Debian/Ubuntu-supplied native cross compilers from /usr/bin to be used
  • Allow RISCV_SYSROOT to be overriden but still use /opt/fedora28_riscv_root *(what Adopt uses) as the default.
  • If the tag detection logic fails e.g. building from a different openjdk repository and --disable-adopt-branch-safety is specified, use 8u000-b00 or jdk-nn-0.0.0+0 to allow building

I would imagine this is all pretty non-controversial, although I'm "open to offers" on the last item here. See this Slack thread for the original discussion - I've chosen here to re-use the existing flag to handle all "I'm building from somewhere funky" situations, but it could be an alternate parameter e.g. an "Override the tag to be this value explicitly" (can be done separately in a future PR of course)

I do also wonder whether we should split out temurin as a separate variant to HotSpot now - the more I think about it in various conversations (particuarly if other people are using our scripts to build HotSpot codebases) the more I think it would keep things simple ... Raised proposal in #2671

THIS IS IN DRAFT AS I WANT TO DO SOME FURTHER CHECKS, BUT REVIEWS/COMMENTS ARE VERY WELCOME IN THE MEANTIME.

Signed-off-by: Stewart X Addison sxa@redhat.com

@sxa sxa added the enhancement Issues that enhance the code or documentation of the repo in any way label Jul 2, 2021
@sxa sxa added this to In Progress in temurin-build via automation Jul 2, 2021
@github-actions github-actions bot added the cross-compile Issues that affect or relate to cross compiled platforms (e.g. RISC-V) label Jul 2, 2021
Copy link
Contributor

@karianna karianna left a comment

Choose a reason for hiding this comment

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

Nitpicks + one linter failure.

build-farm/platform-specific-configurations/linux.sh Outdated Show resolved Hide resolved
build-farm/platform-specific-configurations/linux.sh Outdated Show resolved Hide resolved
CONFIGURE_ARGS_FOR_ANY_PLATFORM="${CONFIGURE_ARGS_FOR_ANY_PLATFORM} --with-build-jdk=$BUILDJDK --disable-ddr"
if [ -d /usr/local/openssl102 ]; then
Copy link
Contributor

Choose a reason for hiding this comment

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

Seems brittle on specific version?

Copy link
Member Author

Choose a reason for hiding this comment

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

Can you explain that comment please?

Copy link
Contributor

Choose a reason for hiding this comment

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

It's checking for a very specific version of openssl102 - is there a way to future proof that?

Copy link
Member Author

Choose a reason for hiding this comment

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

This should be a temporary tactical fix - it's a workaround for the fact that the new --withopenssl=fetched added a few weeks ago doesn't currently work on RISC-V, so the future proofing will be for the OpenJ9 team to make the fetched option work.

sbin/build.sh Show resolved Hide resolved
temurin-build automation moved this from In Progress to Review/QA Jul 2, 2021
@github-actions github-actions bot added the jenkins Issues that enhance or fix our jenkins server label Jul 2, 2021
…sitories

Signed-off-by: Stewart X Addison <sxa@redhat.com>
@github-actions github-actions bot added jenkins Issues that enhance or fix our jenkins server and removed jenkins Issues that enhance or fix our jenkins server labels Jul 2, 2021
Copy link
Contributor

@karianna karianna left a comment

Choose a reason for hiding this comment

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

LGTM now.

@sxa
Copy link
Member Author

sxa commented Jul 5, 2021

Thanks. I'm still doing a few more tests and will merge later this week

@github-actions github-actions bot added jenkins Issues that enhance or fix our jenkins server and removed jenkins Issues that enhance or fix our jenkins server labels Jul 6, 2021
Signed-off-by: Stewart X Addison <sxa@redhat.com>
@github-actions github-actions bot added jenkins Issues that enhance or fix our jenkins server and removed jenkins Issues that enhance or fix our jenkins server labels Jul 6, 2021
@sxa
Copy link
Member Author

sxa commented Jul 6, 2021

Has been tested with the two RISC-V builds (Thanks @andrew-m-leonard) we have and has not made things any worse, but will enable this to be used in more environments, so taking out of draft.

@sxa sxa marked this pull request as ready for review July 6, 2021 17:20
@sxa sxa merged commit e916ee2 into adoptium:master Jul 6, 2021
temurin-build automation moved this from Review/QA to Done Jul 6, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cross-compile Issues that affect or relate to cross compiled platforms (e.g. RISC-V) enhancement Issues that enhance the code or documentation of the repo in any way jenkins Issues that enhance or fix our jenkins server
Projects
No open projects
temurin-build
  
Done
Development

Successfully merging this pull request may close these issues.

None yet

3 participants