RFR: 8329086: Clean up java.desktop native compilation

[Magnus Ihse Bursie]

On Tue, 26 Mar 2024 12:51:38 GMT, Magnus Ihse Bursie <ihse at openjdk.org> wrote:

> This is a follow-up on [JDK-8328680](https://bugs.openjdk.org/browse/JDK-8328680), making the same kind of cleanup to java.desktop. Some code needed more special treatment here, so there is some additional effects outside of the modules/java.desktop directory. The code was also in worse shape than other modules, so some additional changes to the build logic where needed.

If the total PR is hard to read, I recommend reviewing this by looking at each individual commit instead. I've tried to make them simple and explain what I'm doing.

make/modules/java.desktop/lib/Awt2dLibraries.gmk line 280:

> 278:   # as includes, instead the system headers should be used.
> 279:   LIBLCMS_HEADERS_FROM_SRC := false
> 280:   # FIXME: Keep old behavior and reset LCMS_CFLAGS. This is likely a bug.

A comment here: This code is equivalent with the old code, but it seems pretty obvious that this is a bug. I'm somewhat reluctant to changing the actual behavior in a refactor PR like this, but otoh this is a very small fix that would only affect someone running with an external lcms with non-empty CFLAGS. So if anyone thinks I should fix this right now in this PR, I can do so. Otherwise I'll file a follow-up bug and fix this in that one instead. (If nothing else, I think backporters will thank me for going that route instead.)

-------------

PR Comment: https://git.openjdk.org/jdk/pull/18486#issuecomment-2020358981
PR Review Comment: https://git.openjdk.org/jdk/pull/18486#discussion_r1539179250