Skip to content

Commit

Permalink
8324347: Enable "maybe-uninitialized" warning for FreeType 2.13.1
Browse files Browse the repository at this point in the history
Reviewed-by: erikj, azvegint, jwaters, aivanov
  • Loading branch information
mrserb committed Jan 26, 2024
1 parent 33324a5 commit 781f368
Showing 1 changed file with 0 additions and 2 deletions.
2 changes: 0 additions & 2 deletions make/modules/java.desktop/lib/Awt2dLibraries.gmk
Original file line number Diff line number Diff line change
Expand Up @@ -449,7 +449,6 @@ else
LIBFREETYPE_LIBS := -lfreetype
endif

# gcc_ftobjs.c := maybe-uninitialized required for GCC 7 builds.
$(eval $(call SetupJdkLibrary, BUILD_LIBFREETYPE, \
NAME := freetype, \
OPTIMIZATION := HIGHEST, \
Expand All @@ -458,7 +457,6 @@ else
EXTRA_HEADER_DIRS := $(BUILD_LIBFREETYPE_HEADER_DIRS), \
DISABLED_WARNINGS_microsoft := 4267 4244 4996, \
DISABLED_WARNINGS_gcc := dangling-pointer stringop-overflow, \
DISABLED_WARNINGS_gcc_ftobjs.c := maybe-uninitialized, \
LDFLAGS := $(LDFLAGS_JDKLIB) \
$(call SET_SHARED_LIBRARY_ORIGIN), \
))
Expand Down

7 comments on commit 781f368

@openjdk-notifier
Copy link

Choose a reason for hiding this comment

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

@mrserb
Copy link
Member Author

@mrserb mrserb commented on 781f368 Jan 28, 2024

Choose a reason for hiding this comment

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

/backport jdk21u-dev

@openjdk
Copy link

@openjdk openjdk bot commented on 781f368 Jan 28, 2024

Choose a reason for hiding this comment

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

@mrserb the backport was successfully created on the branch backport-mrserb-781f368d in my personal fork of openjdk/jdk21u-dev. To create a pull request with this backport targeting openjdk/jdk21u-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 781f368d from the openjdk/jdk repository.

The commit being backported was authored by Sergey Bylokhov on 26 Jan 2024 and was reviewed by Erik Joelsson, Alexander Zvegintsev, Julian Waters and Alexey Ivanov.

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/jdk21u-dev:

$ git fetch https://github.com/openjdk-bots/jdk21u-dev.git backport-mrserb-781f368d:backport-mrserb-781f368d
$ git checkout backport-mrserb-781f368d
# make changes
$ git add paths/to/changed/files
$ git commit --message 'Describe additional changes made'
$ git push https://github.com/openjdk-bots/jdk21u-dev.git backport-mrserb-781f368d

@mrserb
Copy link
Member Author

@mrserb mrserb commented on 781f368 Jan 29, 2024

Choose a reason for hiding this comment

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

/backport jdk17u-dev

@openjdk
Copy link

@openjdk openjdk bot commented on 781f368 Jan 29, 2024

Choose a reason for hiding this comment

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

@mrserb Could not automatically backport 781f368d to openjdk/jdk17u-dev due to conflicts in the following files:

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

Please fetch the appropriate branch/commit and manually resolve these conflicts by using the following commands in your personal fork of openjdk/jdk17u-dev. Note: these commands are just some suggestions and you can use other equivalent commands you know.

# Fetch the up-to-date version of the target branch
$ git fetch --no-tags https://git.openjdk.org/jdk17u-dev.git master:master

# Check out the target branch and create your own branch to backport
$ git checkout master
$ git checkout -b backport-mrserb-781f368d

# Fetch the commit you want to backport
$ git fetch --no-tags https://git.openjdk.org/jdk.git 781f368d421a94857929e4168974f43e890637d8

# Backport the commit
$ git cherry-pick --no-commit 781f368d421a94857929e4168974f43e890637d8
# Resolve conflicts now

# Commit the files you have modified
$ git add files/with/resolved/conflicts
$ git commit -m 'Backport 781f368d421a94857929e4168974f43e890637d8'

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

Below you can find a suggestion for the pull request body:

Hi all,

This pull request contains a backport of commit 781f368d from the openjdk/jdk repository.

The commit being backported was authored by Sergey Bylokhov on 26 Jan 2024 and was reviewed by Erik Joelsson, Alexander Zvegintsev, Julian Waters and Alexey Ivanov.

Thanks!

@mrserb
Copy link
Member Author

@mrserb mrserb commented on 781f368 Feb 13, 2024

Choose a reason for hiding this comment

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

/backport jdk22u

@openjdk
Copy link

@openjdk openjdk bot commented on 781f368 Feb 13, 2024

Choose a reason for hiding this comment

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

@mrserb the backport was successfully created on the branch backport-mrserb-781f368d in my personal fork of openjdk/jdk22u. To create a pull request with this backport targeting openjdk/jdk22u: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 781f368d from the openjdk/jdk repository.

The commit being backported was authored by Sergey Bylokhov on 26 Jan 2024 and was reviewed by Erik Joelsson, Alexander Zvegintsev, Julian Waters and Alexey Ivanov.

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/jdk22u:

$ git fetch https://github.com/openjdk-bots/jdk22u.git backport-mrserb-781f368d:backport-mrserb-781f368d
$ git checkout backport-mrserb-781f368d
# make changes
$ git add paths/to/changed/files
$ git commit --message 'Describe additional changes made'
$ git push https://github.com/openjdk-bots/jdk22u.git backport-mrserb-781f368d

⚠️ @mrserb You are not yet a collaborator in my fork openjdk-bots/jdk22u. An invite will be sent out and you need to accept it before you can proceed.

Please sign in to comment.