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

8287754: Update jib GNU make dependency on Windows to latest cygwin build #10805

Closed
wants to merge 1 commit into from

Conversation

erikj79
Copy link
Member

@erikj79 erikj79 commented Oct 20, 2022

For Oracle internal builds we control the version of GNU Make (currently fixed at 4.0). In Cygwin this is causing problems as the now rather dated GNU Make binary we use isn't compatible with Cygwin.dll version 3.3 or later. To work around this, I'm making the dependency dynamic on the version of Cygwin. If the currently running Cygwin is new enough, the dependency will be on GNU make 4.3.


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-8287754: Update jib GNU make dependency on Windows to latest cygwin build

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 10805

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Oct 20, 2022

👋 Welcome back erikj! 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 JDK-8287754 8287754: Update jib GNU make dependency on Windows to latest cygwin build Oct 20, 2022
@openjdk openjdk bot added the rfr Pull request is ready for review label Oct 20, 2022
@openjdk
Copy link

openjdk bot commented Oct 20, 2022

@erikj79 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 Oct 20, 2022
@mlbridge
Copy link

mlbridge bot commented Oct 20, 2022

Webrevs

Copy link
Member

@djelinski djelinski left a comment

Choose a reason for hiding this comment

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

I can confirm that with these changes the build is using make 4.3, and is using all cores as expected.

Copy link
Member

@magicus magicus 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
Copy link

openjdk bot commented Oct 24, 2022

@erikj79 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:

8287754: Update jib GNU make dependency on Windows to latest cygwin build

Reviewed-by: djelinski, ihse, mikael

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 396 new commits pushed to 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 Oct 24, 2022
@erikj79
Copy link
Member Author

erikj79 commented Oct 25, 2022

/integrate

@openjdk
Copy link

openjdk bot commented Oct 25, 2022

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

  • 9051dde: 8294993: LingeredApp test update
  • f37a605: 8295212: G1: Add wrapper for TruncatedSeqs that need separation by gc phase
  • 6673cd8: 8295554: Move the "sizecalc.h" to the correct location
  • 706d1b7: 8295798: (ch) Test java/nio/channels/Channels/ReadXBytes.java is very slow on Windows
  • 89dafc0: 8292699: Improve printing of classes in native debugger
  • 7520d0a: 8295855: ProblemList jdk/jshell/CommandCompletionTest.java on linux-all
  • 1d15e5c: 8295716: Minimize disabled warnings in security libs
  • 8c86e92: 8295847: slow debug build error after JDK-8294466
  • e122321: 8295844: jdk/test/whitebox/CPUInfoTest.java failed with "not all features are known: expected true, was false"
  • df81b3c: 8295738: Automate javax/swing/JFileChooser/FileSizeCheck.java
  • ... and 392 more: https://git.openjdk.org/jdk/compare/3675f4c2afd10b5042948fc79e62caee5f3874ce...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Oct 25, 2022

@erikj79 Pushed as commit af2de97.

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
build build-dev@openjdk.org integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

4 participants