Skip to content
This repository was archived by the owner on Sep 2, 2022. It is now read-only.
/ jdk17 Public archive

8270203: Missing build dependency between jdk.jfr-gendata and buildtools-hotspot #239

Closed
wants to merge 2 commits into from

Conversation

erikj79
Copy link
Member

@erikj79 erikj79 commented Jul 9, 2021

Add missing make dependency in Main.gmk.


Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • Change must be properly reviewed

Issue

  • JDK-8270203: Missing build dependency between jdk.jfr-gendata and buildtools-hotspot

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk17 pull/239/head:pull/239
$ git checkout pull/239

Update a local copy of the PR:
$ git checkout pull/239
$ git pull https://git.openjdk.java.net/jdk17 pull/239/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 239

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk17/pull/239.diff

@bridgekeeper
Copy link

bridgekeeper bot commented Jul 9, 2021

👋 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-8270203 8270203: Missing build dependency between jdk.jfr-gendata and buildtools-hotspot Jul 9, 2021
@openjdk openjdk bot added the rfr Pull request is ready for review label Jul 9, 2021
@openjdk
Copy link

openjdk bot commented Jul 9, 2021

@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.java.net label Jul 9, 2021
@mlbridge
Copy link

mlbridge bot commented Jul 9, 2021

Webrevs

Copy link
Member

@tbell29552 tbell29552 left a comment

Choose a reason for hiding this comment

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

Looks good

@openjdk
Copy link

openjdk bot commented Jul 11, 2021

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

8270203: Missing build dependency between jdk.jfr-gendata and buildtools-hotspot

Reviewed-by: tbell

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

  • 4fc3180: 8266345: (fs) Custom DefaultFileSystemProvider security related loops
  • 999ced0: 8269873: serviceability/sa/Clhsdb tests are using a C2 specific VMStruct field
  • e1d3e73: 8268965: TCP Connection Reset when connecting simple socket to SSL server
  • 3d82b0e: 8269558: fix of JDK-8252657 missed to update history at the end of JVM TI spec
  • 2546006: 8270216: [macOS] Update named used for Java run loop mode
  • 6889a39: 8268826: Cleanup Override in Context-Specific Deserialization Filters
  • f791fdf: 8261147: C2: Node is wrongly marked as reduction resulting in a wrong execution due to wrong vector instructions
  • 1196b35: 8270151: IncompatibleClassChangeError on empty pattern switch statement case
  • 885f7b1: 8269146: Missing unreported constraints on pattern and other case label combination
  • 62ff55d: 8269952: compiler/vectorapi/VectorCastShape*Test.java tests failed on avx2 machines
  • ... and 10 more: https://git.openjdk.java.net/jdk17/compare/6000950b339e4346292b69079f16ce0d4c278246...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 ready Pull request is ready to be integrated label Jul 11, 2021
make/Main.gmk Outdated
@@ -857,6 +857,9 @@ else
# virtual target.
jdk.jdwp.agent-libs: jdk.jdwp.agent-gensrc

# jdk.jfr-gensrc uses TOOL_JFR_GEN from buildtools-hotspot
Copy link
Member

Choose a reason for hiding this comment

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

The comment and the code do not match. I assume the comment is incorrect.

@erikj79
Copy link
Member Author

erikj79 commented Jul 13, 2021

/integrate

@openjdk
Copy link

openjdk bot commented Jul 13, 2021

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

  • 4fc3180: 8266345: (fs) Custom DefaultFileSystemProvider security related loops
  • 999ced0: 8269873: serviceability/sa/Clhsdb tests are using a C2 specific VMStruct field
  • e1d3e73: 8268965: TCP Connection Reset when connecting simple socket to SSL server
  • 3d82b0e: 8269558: fix of JDK-8252657 missed to update history at the end of JVM TI spec
  • 2546006: 8270216: [macOS] Update named used for Java run loop mode
  • 6889a39: 8268826: Cleanup Override in Context-Specific Deserialization Filters
  • f791fdf: 8261147: C2: Node is wrongly marked as reduction resulting in a wrong execution due to wrong vector instructions
  • 1196b35: 8270151: IncompatibleClassChangeError on empty pattern switch statement case
  • 885f7b1: 8269146: Missing unreported constraints on pattern and other case label combination
  • 62ff55d: 8269952: compiler/vectorapi/VectorCastShape*Test.java tests failed on avx2 machines
  • ... and 10 more: https://git.openjdk.java.net/jdk17/compare/6000950b339e4346292b69079f16ce0d4c278246...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot closed this Jul 13, 2021
@openjdk openjdk bot added integrated Pull request has been integrated and removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Jul 13, 2021
@openjdk
Copy link

openjdk bot commented Jul 13, 2021

@erikj79 Pushed as commit 0f32982.

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

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

Successfully merging this pull request may close these issues.

3 participants