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

[Jaikiran Pai]

On Wed, 11 May 2022 11:52:55 GMT, Magnus Ihse Bursie <ihse at openjdk.org> wrote:

>> 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
>
> make/autoconf/lib-bundled.m4 line 224:
> 
>> 222:   LIBZ_LIBS=""
>> 223:   if test "x$USE_EXTERNAL_LIBZ" = "xfalse"; then
>> 224:     LIBZ_CFLAGS="$LIBZ_CFLAGS $APPLE_LIBZ_CFLAGS -I$TOPDIR/src/java.base/share/native/libzip/zlib"
> 
> Declaring APPLE_LIBZ_CFLAGS far away (and only conditionally) and then using it once here just makes for hard-to-read code. 
> 
> Suggestion:
> 
>     LIBZ_CFLAGS="$LIBZ_CFLAGS -I$TOPDIR/src/java.base/share/native/libzip/zlib"
>     if test "x$OPENJDK_TARGET_OS" = xmacosx; then
>       LIBZ_CFLAGS="$LIBZ_CFLAGS -DHAVE_UNISTD_H"
>     fi
> 
> ... and remove the assignment above.

Updated the PR to implement this suggestion

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

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