Navigation Menu

Skip to content

Commit

Permalink
8266545: 8261169 broke Harfbuzz build with gcc 7 and 8
Browse files Browse the repository at this point in the history
Reviewed-by: mbaesken, rrich
  • Loading branch information
tstuefe committed May 6, 2021
1 parent 2dd5667 commit a86ee9b
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion make/modules/java.desktop/lib/Awt2dLibraries.gmk
Expand Up @@ -465,7 +465,7 @@ else

HARFBUZZ_DISABLED_WARNINGS_gcc := type-limits missing-field-initializers strict-aliasing
HARFBUZZ_DISABLED_WARNINGS_CXX_gcc := reorder delete-non-virtual-dtor strict-overflow \
maybe-uninitialized class-memaccess unused-result
maybe-uninitialized class-memaccess unused-result extra
HARFBUZZ_DISABLED_WARNINGS_clang := unused-value incompatible-pointer-types \
tautological-constant-out-of-range-compare int-to-pointer-cast \
undef missing-field-initializers range-loop-analysis \
Expand Down

3 comments on commit a86ee9b

@openjdk-notifier
Copy link

Choose a reason for hiding this comment

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

@MBaesken
Copy link
Member

Choose a reason for hiding this comment

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

/backport jdk11u-dev

@openjdk
Copy link

@openjdk openjdk bot commented on a86ee9b Mar 23, 2022

Choose a reason for hiding this comment

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

@MBaesken Could not automatically backport a86ee9b3 to openjdk/jdk11u-dev due to conflicts in the following files:

  • make/modules/java.desktop/lib/Awt2dLibraries.gmk

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

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

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

Please sign in to comment.