Skip to content

Commit

Permalink
8261109: [macOS] Remove disabled warning for JNF in make/autoconf/fla…
Browse files Browse the repository at this point in the history
…gs-cflags.m4

Reviewed-by: serb, ihse, erikj
  • Loading branch information
prrace committed Feb 4, 2021
1 parent c59e4b6 commit 3bb6a3d
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 8 deletions.
5 changes: 0 additions & 5 deletions make/autoconf/flags-cflags.m4
Original file line number Diff line number Diff line change
Expand Up @@ -168,11 +168,6 @@ AC_DEFUN([FLAGS_SETUP_WARNINGS],
DISABLED_WARNINGS="unknown-warning-option unused-parameter unused"
if test "x$OPENJDK_TARGET_OS" = xmacosx; then
# missing-method-return-type triggers in JavaNativeFoundation framework
DISABLED_WARNINGS="$DISABLED_WARNINGS missing-method-return-type"
fi
;;
xlc)
Expand Down
3 changes: 0 additions & 3 deletions make/modules/java.base/Lib.gmk
Original file line number Diff line number Diff line change
Expand Up @@ -96,8 +96,6 @@ $(BUILD_LIBNIO): $(BUILD_LIBNET)
# Create the macosx security library

ifeq ($(call isTargetOs, macosx), true)
# JavaNativeFoundation framework not supported in static builds
ifneq ($(STATIC_BUILD), true)

$(eval $(call SetupJdkLibrary, BUILD_LIBOSXSECURITY, \
NAME := osxsecurity, \
Expand All @@ -120,7 +118,6 @@ ifeq ($(call isTargetOs, macosx), true)

TARGETS += $(BUILD_LIBOSXSECURITY)

endif
endif

################################################################################
Expand Down

5 comments on commit 3bb6a3d

@openjdk-notifier
Copy link

Choose a reason for hiding this comment

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

@VladimirKempik
Copy link

Choose a reason for hiding this comment

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

/backport jdk15u-dev

@openjdk
Copy link

@openjdk openjdk bot commented on 3bb6a3d Jul 27, 2021

Choose a reason for hiding this comment

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

@VladimirKempik the backport was successfully created on the branch VladimirKempik-backport-3bb6a3d2 in my personal fork of openjdk/jdk15u-dev. To create a pull request with this backport targeting openjdk/jdk15u-dev:master, just click the following link:

➡️ Create pull request

The title of the pull request is automatically filled in correctly and below you find a suggestion for the pull request body:

Hi all,

this pull request contains a backport of commit 3bb6a3d2 from the openjdk/jdk repository.

The commit being backported was authored by Phil Race on 4 Feb 2021 and was reviewed by Sergey Bylokhov, Magnus Ihse Bursie and Erik Joelsson.

Thanks!

If you need to update the source branch of the pull then run the following commands in a local clone of your personal fork of openjdk/jdk15u-dev:

$ git fetch https://github.com/openjdk-bots/jdk15u-dev VladimirKempik-backport-3bb6a3d2:VladimirKempik-backport-3bb6a3d2
$ git checkout VladimirKempik-backport-3bb6a3d2
# make changes
$ git add paths/to/changed/files
$ git commit --message 'Describe additional changes made'
$ git push https://github.com/openjdk-bots/jdk15u-dev VladimirKempik-backport-3bb6a3d2

@VladimirKempik
Copy link

Choose a reason for hiding this comment

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

/backport jdk13u-dev

@openjdk
Copy link

@openjdk openjdk bot commented on 3bb6a3d Jul 27, 2021

Choose a reason for hiding this comment

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

@VladimirKempik could not automatically backport 3bb6a3d2 to openjdk/jdk13u-dev due to conflicts in the following files:

  • make/modules/java.base/Lib.gmk

To manually resolve these conflicts run the following commands in your personal fork of openjdk/jdk13u-dev:

$ git checkout -b VladimirKempik-backport-3bb6a3d2
$ git fetch --no-tags https://git.openjdk.java.net/jdk 3bb6a3d2ab96373baa4e18f4e61173f11225fd4e
$ git cherry-pick --no-commit 3bb6a3d2ab96373baa4e18f4e61173f11225fd4e
$ # Resolve conflicts
$ git add files/with/resolved/conflicts
$ git commit -m 'Backport 3bb6a3d2ab96373baa4e18f4e61173f11225fd4e'

Once you have resolved the conflicts as explained above continue with creating a pull request towards the openjdk/jdk13u-dev with the title Backport 3bb6a3d2ab96373baa4e18f4e61173f11225fd4e.

Please sign in to comment.