Skip to content

8286582: Build fails on macos aarch64 when using --with-zlib=bundled #1177

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

Closed
wants to merge 1 commit into from

Conversation

mrserb
Copy link
Member

@mrserb mrserb commented Jun 23, 2022

Hi all,
This pull request contains a backport of commit 50d47de8 from the openjdk/jdk repository.
The commit being backported was authored by Jaikiran Pai on 12 May 2022 and was reviewed by Magnus Ihse Bursie and Lance Andersen.
Thanks!


Progress

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

Issue

  • JDK-8286582: Build fails on macos aarch64 when using --with-zlib=bundled

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 1177

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Jun 23, 2022

👋 Welcome back serb! 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 50d47de8358e2f22bf3a4a165d660c25ef6eacbc 8286582: Build fails on macos aarch64 when using --with-zlib=bundled Jun 23, 2022
@openjdk
Copy link

openjdk bot commented Jun 23, 2022

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

@openjdk openjdk bot added the backport label Jun 23, 2022
@mrserb mrserb force-pushed the mrserb-backport-50d47de8 branch from c54f990 to c8fdb4d Compare June 23, 2022 07:02
@@ -869,7 +870,8 @@ ifeq ($(ENABLE_HEADLESS_ONLY), false)
EXTRA_HEADER_DIRS := $(LIBSPLASHSCREEN_HEADER_DIRS), \
DISABLED_WARNINGS_gcc := sign-compare type-limits unused-result \
maybe-uninitialized shift-negative-value implicit-fallthrough, \
DISABLED_WARNINGS_clang := incompatible-pointer-types deprecated-declarations, \
DISABLED_WARNINGS_clang := incompatible-pointer-types deprecated-declarations \
Copy link
Member Author

Choose a reason for hiding this comment

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

/clean I manually fixed conflict in this line since the jdk11 has a different list of disabled warnings, also the dates in the copyrights are different.

@mrserb mrserb marked this pull request as ready for review June 23, 2022 08:57
@openjdk openjdk bot added the rfr Pull request is ready for review label Jun 23, 2022
@mlbridge
Copy link

mlbridge bot commented Jun 23, 2022

Webrevs

@mrserb
Copy link
Member Author

mrserb commented Jun 23, 2022

/clean see comment above

@openjdk openjdk bot added the clean label Jun 23, 2022
@openjdk
Copy link

openjdk bot commented Jun 23, 2022

@mrserb This backport pull request is now marked as clean

@openjdk
Copy link

openjdk bot commented Jun 23, 2022

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

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

8286582: Build fails on macos aarch64 when using --with-zlib=bundled

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

  • f129738: 8288754: GCC 12 fails to build zReferenceProcessor.cpp
  • e16aaca: 8253829: Wrong length compared in SSPI bridge
  • 1c1f7a1: 8210722: JAXP Tests: CatalogSupport2 and CatalogSupport3 generate incorrect messages upon failure
  • 8138382: 8266881: Enable debug log for SSLEngineExplorerMatchedSNI.java
  • 4945cfe: 8164804: sun/security/ssl/SSLSocketImpl/CloseSocket.java makes not reliable time assumption
  • d12c2e2: 8217170: gc/arguments/TestUseCompressedOopsErgo.java timed out
  • c10e0de: 8272398: Update DockerTestUtils.buildJdkDockerImage()

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 Jun 23, 2022
@mrserb
Copy link
Member Author

mrserb commented Jun 25, 2022

/integrate

@openjdk
Copy link

openjdk bot commented Jun 25, 2022

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

  • 27faf15: 8273526: Extend the OSContainer API pids controller with pids.current
  • 6c389cd: 8278519: serviceability/jvmti/FieldAccessWatch/FieldAccessWatch.java failed "assert(handle != __null) failed: JNI handle should not be null"
  • 43e6fdb: 8281569: Create tests for Frame.setMinimumSize() method
  • f129738: 8288754: GCC 12 fails to build zReferenceProcessor.cpp
  • e16aaca: 8253829: Wrong length compared in SSPI bridge
  • 1c1f7a1: 8210722: JAXP Tests: CatalogSupport2 and CatalogSupport3 generate incorrect messages upon failure
  • 8138382: 8266881: Enable debug log for SSLEngineExplorerMatchedSNI.java
  • 4945cfe: 8164804: sun/security/ssl/SSLSocketImpl/CloseSocket.java makes not reliable time assumption
  • d12c2e2: 8217170: gc/arguments/TestUseCompressedOopsErgo.java timed out
  • c10e0de: 8272398: Update DockerTestUtils.buildJdkDockerImage()

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Jun 25, 2022

@mrserb Pushed as commit 8363d9d.

💡 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
backport clean integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

1 participant