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

8296904: Improve handling of macos xcode toolchain #1584

Closed

Conversation

RealCLanger
Copy link
Contributor

@RealCLanger RealCLanger commented Dec 11, 2022

This is a backport of JDK-8296904. Changes to make/autoconf/basic.m4 from jdk17u-dev apply cleanly.
I resolved building.md to the state of jdk11u-dev and regenerated the html files with Pandoc 2.3.1. This also modified testing.html.


Progress

  • Change must be properly reviewed (1 review required, with at least 1 Reviewer)
  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue

Issue

  • JDK-8296904: Improve handling of macos xcode toolchain

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk11u-dev pull/1584/head:pull/1584
$ git checkout pull/1584

Update a local copy of the PR:
$ git checkout pull/1584
$ git pull https://git.openjdk.org/jdk11u-dev pull/1584/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 1584

View PR using the GUI difftool:
$ git pr show -t 1584

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk11u-dev/pull/1584.diff

@bridgekeeper
Copy link

bridgekeeper bot commented Dec 11, 2022

👋 Welcome back clanger! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

@openjdk openjdk bot changed the title Backport 57e6d92a6ddbfe78cbf250a4502ce0911ee6f75a 8296904: Improve handling of macos xcode toolchain Dec 11, 2022
@openjdk
Copy link

openjdk bot commented Dec 11, 2022

This backport pull request has now been updated with issue from the original commit.

@openjdk openjdk bot added backport rfr Pull request is ready for review labels Dec 11, 2022
@mlbridge
Copy link

mlbridge bot commented Dec 11, 2022

Webrevs

Copy link
Member

@MBaesken MBaesken left a comment

Choose a reason for hiding this comment

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

looks like we test in basic.m4 for DEVKIT_ROOT in the if check, but we do not use it afterwards and go directly to UTIL_LOOKUP_PROGS using TOOLCHAIN_PATH.
This seems to be different in head
https://github.com/openjdk/jdk/blob/470f3424fcce0e41b75cccdd5e3a56771cd07ff5/make/autoconf/basic.m4#L137

but on the other hand we do it in 17u-dev the same way. So probably the backport is okay, but maybe not optimal (comparing to head) ?

@RealCLanger
Copy link
Contributor Author

Hi, as I've already commented in the 17u-dev PR, this would be fixed with backporting JDK-8287254, something we could/should consider independently.

@openjdk
Copy link

openjdk bot commented Dec 14, 2022

@RealCLanger This change now passes all automated pre-integration checks.

After integration, the commit message for the final commit will be:

8296904: Improve handling of macos xcode toolchain

Reviewed-by: mbaesken

You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed.

At the time when this comment was updated there had been 3 new commits pushed to the master branch:

  • e5c800c: Merge
  • 6400cdc: 8258005: JDK build fails with incorrect fixpath script
  • 9197181: 8296878: Document Filter attached to JPasswordField and setText("") is not cleared instead inserted characters replaced with unicode null characters

Please see this link for an up-to-date comparison between the source branch of this pull request and the master branch.
As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this automatic rebasing, please check the documentation for the /integrate command for further details.

➡️ To integrate this PR with the above commit message to the master branch, type /integrate in a new comment.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Dec 14, 2022
@RealCLanger
Copy link
Contributor Author

/integrate

@openjdk
Copy link

openjdk bot commented Dec 19, 2022

Going to push as commit 8a4915e.
Since your change was applied there have been 10 commits pushed to the master branch:

  • 5f4b38a: 8290899: java/lang/String/StringRepeat.java test requests too much heap on windows x86
  • 3f66b16: 8294580: frame::interpreter_frame_print_on() crashes if free BasicObjectLock exists in frame
  • 01f5a19: 8287011: Improve container information
  • 12eca2f: 8256126: Create implementation for NSAccessibilityImage protocol peer
  • b3c7b28: 8298459: Fix msys2 linking and handling out of tree build directory for source zip creation
  • 604dd4d: 8179317: [TESTBUG] rewrite runtime shell tests in java
  • 7d50d51: 8259267: Refactor LoaderLeak shell test as java test.
  • e5c800c: Merge
  • 6400cdc: 8258005: JDK build fails with incorrect fixpath script
  • 9197181: 8296878: Document Filter attached to JPasswordField and setText("") is not cleared instead inserted characters replaced with unicode null characters

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Dec 19, 2022
@openjdk openjdk bot closed this Dec 19, 2022
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Dec 19, 2022
@openjdk
Copy link

openjdk bot commented Dec 19, 2022

@RealCLanger Pushed as commit 8a4915e.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.

@RealCLanger RealCLanger deleted the RealCLanger-backport-57e6d92a branch December 19, 2022 09:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport integrated Pull request has been integrated
2 participants