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

8329173: LCMS_CFLAGS from configure are lost #24131

Closed
wants to merge 1 commit into from

Conversation

magicus
Copy link
Member

@magicus magicus commented Mar 20, 2025

In JDK-8329086, when cleaning up the native build for java.desktop, what was likely a bug with LCMS_CFLAGS was found. See the discussion at #18486 (comment).

The old behavior was kept to not introduce any changes in that refactoring PR, but now the time has come to clean this up.


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-8329173: LCMS_CFLAGS from configure are lost (Bug - P5)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 24131

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

Using diff file

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

Using Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Mar 20, 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 Mar 20, 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:

8329173: LCMS_CFLAGS from configure are lost

Reviewed-by: erikj, azvegint

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

  • 56038fb: 8352317: Assertion failure during size estimation of BoxLockNode with -XX:+UseAPX
  • 2bc4f64: 8335708: C2: Compile::verify_graph_edges must start at root and safepoints, just like CCP traversal
  • 9a17a6f: 8350749: Upgrade JLine to 3.29.0
  • 91836e1: 8352276: Skip jtreg tests using native executable with libjvm.so/libjli.so dependencies on static JDK
  • 2560a63: 8352131: [REDO] C2: Print compilation bailouts with PrintCompilation compile command
  • 73177d9: 8347734: Turning off PerfData logging doesn't work

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

openjdk bot commented Mar 20, 2025

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

  • build
  • client

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

@mlbridge
Copy link

mlbridge bot commented Mar 20, 2025

Webrevs

@magicus magicus mentioned this pull request Mar 20, 2025
3 tasks
@openjdk openjdk bot added the ready Pull request is ready to be integrated label Mar 20, 2025
Copy link
Member

@azvegint azvegint left a comment

Choose a reason for hiding this comment

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

The discussion mentions another JBS issue, which I believe should be closed as duplicate of the 8352510.

@magicus magicus changed the title 8352510: Don't reset LCMS_CFLAGS 8329173: LCMS_CFLAGS from configure are lost Mar 20, 2025
@magicus
Copy link
Member Author

magicus commented Mar 20, 2025

Oh, I missed that. Actually, I think we can stick to the guideline that the older bug has priority, and close the new one as a dup instead.

@magicus
Copy link
Member Author

magicus commented Mar 20, 2025

/integrate

@openjdk
Copy link

openjdk bot commented Mar 20, 2025

Going to push as commit 06ba6cf.
Since your change was applied there have been 6 commits pushed to the master branch:

  • 56038fb: 8352317: Assertion failure during size estimation of BoxLockNode with -XX:+UseAPX
  • 2bc4f64: 8335708: C2: Compile::verify_graph_edges must start at root and safepoints, just like CCP traversal
  • 9a17a6f: 8350749: Upgrade JLine to 3.29.0
  • 91836e1: 8352276: Skip jtreg tests using native executable with libjvm.so/libjli.so dependencies on static JDK
  • 2560a63: 8352131: [REDO] C2: Print compilation bailouts with PrintCompilation compile command
  • 73177d9: 8347734: Turning off PerfData logging doesn't work

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Mar 20, 2025

@magicus Pushed as commit 06ba6cf.

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

@magicus magicus deleted the dont-reset-lcsm-flags branch March 20, 2025 22:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Development

Successfully merging this pull request may close these issues.

3 participants