Ticket #21500: patch-SYSTEM_ZLIB.diff

openjdk/jdk/make/common/Defs-bsd.gmk

@@ -315 +315 @@
   SYSTEM_ZLIB = true
 endif
 
+ifeq ($(OS_VENDOR), Apple)
+  SYSTEM_ZLIB = true
+endif
+
 #
 # Japanese manpages
 #

openjdk/jdk/make/java/instrument/Makefile

@@ -117 +117 @@
       OTHER_LDLIBS += -L$(PACKAGE_PATH)/lib -liconv
     endif
   endif
+  ifeq ($(SYSTEM_ZLIB),true)
+    LDFLAGS += -lz
+  endif
 else
   LDFLAGS += -L $(LIBDIR)/$(LIBARCH)/jli
   OTHER_LDLIBS += -ljli

openjdk/jdk/make/sun/splashscreen/Makefile

@@ -65 +65 @@
 CPPFLAGS += -I$(SHARE_SRC)/native/$(PKGDIR)/image/jpeg
 ifneq ($(SYSTEM_ZLIB),true)
   CPPFLAGS += -I$(SHARE_SRC)/native/java/util/zip/zlib-1.1.3
+else
+  OTHER_LDLIBS += -lz
 endif
 
 

openjdk/jdk/src/share/native/java/util/zip/Adler32.c

@@ -29 +29 @@
 
 #include "jni.h"
 #include "jni_util.h"
+#ifdef SYSTEM_ZLIB
+#include <zlib.h>
+#else
 #include "zlib.h"
+#endif
 
 #include "java_util_zip_Adler32.h"
 

openjdk/jdk/src/share/native/java/util/zip/CRC32.c

@@ -29 +29 @@
 
 #include "jni.h"
 #include "jni_util.h"
+#ifdef SYSTEM_ZLIB
+#include <zlib.h>
+#else
 #include "zlib.h"
+#endif
 
 #include "java_util_zip_CRC32.h"
 

openjdk/jdk/src/share/native/java/util/zip/Deflater.c

@@ -32 +32 @@
 #include "jlong.h"
 #include "jni.h"
 #include "jni_util.h"
+#ifdef SYSTEM_ZLIB
+#include <zlib.h>
+#else
 #include "zlib.h"
+#endif
 
 #include "java_util_zip_Deflater.h"
 

openjdk/jdk/src/share/native/java/util/zip/Inflater.c

@@ -35 +35 @@
 #include "jni.h"
 #include "jvm.h"
 #include "jni_util.h"
+#ifdef SYSTEM_ZLIB
+#include <zlib.h>
+#else
 #include "zlib.h"
+#endif
 #include "java_util_zip_Inflater.h"
 
 #define ThrowDataFormatException(env, msg) \

openjdk/jdk/src/share/native/java/util/zip/zip_util.c

@@ -44 +44 @@
 #include "io_util.h"
 #include "io_util_md.h"
 #include "zip_util.h"
+#ifdef SYSTEM_ZLIB
+#include <zlib.h>
+#else
 #include "zlib.h"
+#endif
 
 #ifdef _ALLBSD_SOURCE
 #include "largefile_bsd.h"