Skip to content

Conversation

@bsdkurt
Copy link
Contributor

@bsdkurt bsdkurt commented Nov 14, 2025

When building with external libpng the PNG defines added to CFLAGS may conflict with the installed libpng header pnglibconf.h resulting in compilation errors. For example on OpenBSD/aarch64:

/usr/local/include/pnglibconf.h:207:9: error: 'PNG_ARM_NEON_OPT' macro redefined [-Werror,-Wmacro-redefined]

This moves all -DPNG_* into the case where internal libpng is used. This has only been tested with the tier1 github actions so needs to be checked on Linux/ppc and AIX.


Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • Change must be properly reviewed (2 reviews required, with at least 1 Reviewer, 1 Author)

Issue

  • JDK-8371914: PNG defines in CFLAGS can cause compilation errors with external libpng (Bug - P4)

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk.git pull/28324/head:pull/28324
$ git checkout pull/28324

Update a local copy of the PR:
$ git checkout pull/28324
$ git pull https://git.openjdk.org/jdk.git pull/28324/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 28324

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/28324.diff

Using Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Nov 14, 2025

👋 Welcome back kurt! 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
Copy link

openjdk bot commented Nov 14, 2025

@bsdkurt This change is no longer ready for integration - check the PR body for details.

@openjdk openjdk bot added build build-dev@openjdk.org client client-libs-dev@openjdk.org labels Nov 14, 2025
@openjdk
Copy link

openjdk bot commented Nov 14, 2025

@bsdkurt The following labels will be automatically applied to this pull request:

  • build
  • client

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing lists. If you would like to change these labels, use the /label pull request command.

@bsdkurt bsdkurt changed the title Only add libpng defines to CFLAGS when using internal libpng. 8371914: Only add libpng defines to CFLAGS when using internal libpng Nov 14, 2025
@openjdk openjdk bot added the rfr Pull request is ready for review label Nov 14, 2025
@bsdkurt bsdkurt changed the title 8371914: Only add libpng defines to CFLAGS when using internal libpng 8371914: PNG defines in CFLAGS can cause compilation errors with external libpng Nov 14, 2025
@mlbridge
Copy link

mlbridge bot commented Nov 14, 2025

Webrevs

Copy link
Member

@erikj79 erikj79 left a comment

Choose a reason for hiding this comment

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

I think this looks ok, but someone from client should weigh in too.

/reviewers 2

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Nov 17, 2025
@openjdk
Copy link

openjdk bot commented Nov 17, 2025

@erikj79
The total number of required reviews for this PR (including the jcheck configuration and the last /reviewers command) is now set to 2 (with at least 1 Reviewer, 1 Author).

@openjdk openjdk bot removed the ready Pull request is ready to be integrated label Nov 17, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

build build-dev@openjdk.org client client-libs-dev@openjdk.org rfr Pull request is ready for review

Development

Successfully merging this pull request may close these issues.

2 participants