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

8347501: Make static-launcher fails after JDK-8346669 #23099

Closed
wants to merge 1 commit into from

Conversation

magicus
Copy link
Member

@magicus magicus commented Jan 14, 2025

Unfortunately, in JDK-8346669 the LIBS argument to SetupBuildLauncher that was passed on to the underlying SetupJdkExecutable was removed, even though it was still used for the static launcher. This causes the build of the static launcher to break.


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-8347501: Make static-launcher fails after JDK-8346669 (Bug - P2)

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk.git pull/23099/head:pull/23099
$ git checkout pull/23099

Update a local copy of the PR:
$ git checkout pull/23099
$ git pull https://git.openjdk.org/jdk.git pull/23099/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 23099

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/23099.diff

Using Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Jan 14, 2025

👋 Welcome back ihse! 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
Copy link

openjdk bot commented Jan 14, 2025

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

ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details.

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

8347501: Make static-launcher fails after JDK-8346669

Reviewed-by: syan, erikj

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 18 new commits pushed to the master branch:

  • b4cd3b1: 8347566: Replace SSIZE_FORMAT with 'z' length modifier
  • f0af830: 8335747: C2: fix overflow case for LoopLimit with constant inputs
  • fec769b: 8346778: Enable native access should work with the source launcher
  • cbb2b84: 8344130: C2: Avoid excessive hoisting in scheduler due to minuscule differences in block frequency
  • bb93f67: 8347646: module-info classfile missing the preview flag
  • 3e989fd: 8346986: Remove ASM from java.base
  • 3967696: 8347496: Test jdk/jfr/jvm/TestModularImage.java fails after JDK-8347124: No javac
  • 6eb83ef: 8347500: hsdis cannot be built with Capstone.next
  • c1d322f: 8347627: Compiler replay tests are failing after JDK-8346990
  • 0ae5c6b: 8342996: Enhance Attach API to support arbitrary length arguments - OSX
  • ... and 8 more: https://git.openjdk.org/jdk/compare/e0f2f4b216bc9358caa65975204aee086e4fcbd2...master

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 rfr Pull request is ready for review label Jan 14, 2025
@openjdk
Copy link

openjdk bot commented Jan 14, 2025

@magicus The following label will be automatically applied to this pull request:

  • build

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing list. If you would like to change these labels, use the /label pull request command.

@openjdk openjdk bot added the build build-dev@openjdk.org label Jan 14, 2025
@mlbridge
Copy link

mlbridge bot commented Jan 14, 2025

Webrevs

@magicus
Copy link
Member Author

magicus commented Jan 14, 2025

/integrate auto

@openjdk openjdk bot added the auto label Jan 14, 2025
@openjdk
Copy link

openjdk bot commented Jan 14, 2025

@magicus This pull request will be automatically integrated when it is ready

Copy link
Member

@sendaoYan sendaoYan 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 fixing this.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Jan 14, 2025
@openjdk
Copy link

openjdk bot commented Jan 14, 2025

/integrate

@openjdk
Copy link

openjdk bot commented Jan 14, 2025

Going to push as commit 1c64a45.
Since your change was applied there have been 18 commits pushed to the master branch:

  • b4cd3b1: 8347566: Replace SSIZE_FORMAT with 'z' length modifier
  • f0af830: 8335747: C2: fix overflow case for LoopLimit with constant inputs
  • fec769b: 8346778: Enable native access should work with the source launcher
  • cbb2b84: 8344130: C2: Avoid excessive hoisting in scheduler due to minuscule differences in block frequency
  • bb93f67: 8347646: module-info classfile missing the preview flag
  • 3e989fd: 8346986: Remove ASM from java.base
  • 3967696: 8347496: Test jdk/jfr/jvm/TestModularImage.java fails after JDK-8347124: No javac
  • 6eb83ef: 8347500: hsdis cannot be built with Capstone.next
  • c1d322f: 8347627: Compiler replay tests are failing after JDK-8346990
  • 0ae5c6b: 8342996: Enhance Attach API to support arbitrary length arguments - OSX
  • ... and 8 more: https://git.openjdk.org/jdk/compare/e0f2f4b216bc9358caa65975204aee086e4fcbd2...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Jan 14, 2025

@openjdk[bot] Pushed as commit 1c64a45.

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

@magicus magicus deleted the restore-libs-to-launcher branch January 14, 2025 14:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
auto build build-dev@openjdk.org integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

3 participants