RFR: 8286582: Build fails on macos aarch64 when using --with-zlib=bundled [v2]

[Lance Andersen]

On Wed, 11 May 2022 14:24:38 GMT, Jaikiran Pai <jpai at openjdk.org> wrote:

>> Can I please get a review of this change which fixes build failures on macos when using `--with-zlib=bundled`?
>> 
>> With this change the build now passes (tested both with bundled and system zlib variants).
>> 
>> tier1, tier2 and tier3 testing has been done and no related failures have been noticed.
>
> Jaikiran Pai has updated the pull request incrementally with four additional commits since the last revision:
> 
>  - copyright years
>  - disable format-nonliteral warning when building LIBSPLASHSCREEN with bundled zlib
>  - Magnus' suggestion - make the LIBZ_CFLAGS more readable in the build file
>  - Magnus' suggestion - Disable format-nonliteral in build section of zlib instead of source code

Hi Jai,

thank you for continuing the work to allow us to build/use the bundled zlib on macOS 

we should also update: open/src/java.base/share/native/libzip/zlib/ChangeLog to add a comment regarding why the build changes were required

make/autoconf/lib-bundled.m4 line 220:

> 218:   if test "x$USE_EXTERNAL_LIBZ" = "xfalse"; then
> 219:     LIBZ_CFLAGS="$LIBZ_CFLAGS -I$TOPDIR/src/java.base/share/native/libzip/zlib"
> 220:     if test "x$OPENJDK_TARGET_OS" = xmacosx; then

Please add a comment here as to why we are doing this

make/modules/java.base/lib/CoreLibraries.gmk line 139:

> 137:     DISABLED_WARNINGS_gcc := unused-function implicit-fallthrough, \
> 138:     DISABLED_WARNINGS_clang := format-nonliteral, \
> 139:     LDFLAGS := $(LDFLAGS_JDKLIB) \

A comment would be good here also as to the reasoning

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

> 681:   ifeq ($(USE_EXTERNAL_LIBZ), false)
> 682:     LIBSPLASHSCREEN_EXTRA_SRC += java.base:libzip/zlib
> 683:     LIBZ_DISABLED_WARNINGS_CLANG := format-nonliteral

Same here for a comment

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

PR: https://git.openjdk.java.net/jdk/pull/8651