changeset 5664:6ced7fea7614

Complete switch from local zlib patch to upstream version.
author andrew
date Wed, 24 Oct 2012 20:24:37 +0100
parents bccc72312326
children 1406789608b7
files make/common/Program.gmk make/java/jli/Makefile make/java/zip/FILES_c.gmk make/java/zip/Makefile make/jdk_generic_profile.sh make/sun/splashscreen/FILES_c.gmk make/sun/splashscreen/Makefile
diffstat 7 files changed, 43 insertions(+), 49 deletions(-) [+]
line wrap: on
line diff
--- a/make/common/Program.gmk	Wed Oct 24 15:12:14 2012 +0100
+++ b/make/common/Program.gmk	Wed Oct 24 20:24:37 2012 +0100
@@ -110,9 +110,6 @@
     endif # ARCH_DATA_MODEL
   endif # PLATFORM SOLARIS
   ifeq ($(PLATFORM), linux)
-    ifdef USE_SYSTEM_ZLIB
-      OTHER_LDLIBS += $(ZLIB_LIBS)
-    endif
     LDFLAGS += $(LDFLAG_Z_ORIGIN)
     LDFLAGS += -Wl,--allow-shlib-undefined
     LDFLAGS += -Wl,-rpath -Wl,\$$ORIGIN/../lib/$(LIBARCH)/jli
@@ -386,14 +383,13 @@
 endif
 
 OTHER_INCLUDES += -I$(LAUNCHER_SHARE_SRC)/bin -I$(LAUNCHER_PLATFORM_SRC)/bin
-
 ifeq ($(PLATFORM), macosx)
   OTHER_INCLUDES += -I$(LAUNCHER_SOLARIS_PLATFORM_SRC)/bin
   ifneq ($(SYSTEM_ZLIB), true)
     OTHER_INCLUDES += -I$(SHARE_SRC)/native/java/util/zip/zlib-1.1.3
   endif # SYSTEM_ZLIB
 else # PLATFORM !MACOSX
-  ifndef USE_SYSTEM_ZLIB
+  ifneq ($(SYSTEM_ZLIB), true)
     OTHER_INCLUDES += -I$(SHARE_SRC)/native/java/util/zip/zlib-1.1.3
   endif
 endif
--- a/make/java/jli/Makefile	Wed Oct 24 15:12:14 2012 +0100
+++ b/make/java/jli/Makefile	Wed Oct 24 20:24:37 2012 +0100
@@ -44,7 +44,7 @@
 
 include $(BUILDDIR)/common/Defs.gmk
 
-ifndef USE_SYSTEM_ZLIB
+ifneq ($(SYSTEM_ZLIB),true)
   ZIP_SRC = $(SHARE_SRC)/native/java/util/zip/zlib-$(ZLIB_VERSION)
 else # SYSTEM_ZLIB
   OTHER_CFLAGS += $(ZLIB_CFLAGS)
@@ -74,23 +74,21 @@
 #
 # Files to compile.
 #
-FILES_c = \
-	java.c \
-	splashscreen_stubs.c \
-	parse_manifest.c \
-	version_comp.c \
-	wildcard.c \
-	jli_util.c
+FILES_c = java.c \
+          splashscreen_stubs.c \
+          parse_manifest.c \
+          version_comp.c \
+          wildcard.c \
+          jli_util.c
 
-ifndef USE_SYSTEM_ZLIB
-FILES_c += \
-	inflate.c \
-	inftrees.c \
-	inffast.c \
-	zadler32.c \
-	zcrc32.c \
-	zutil.c
-endif
+ifneq ($(SYSTEM_ZLIB),true)
+  FILES_c += inflate.c \
+             inftrees.c \
+             inffast.c \
+             zadler32.c \
+             zcrc32.c \
+             zutil.c
+endif # SYSTEM_ZLIB
 
 # add platform specific files
 ifeq ($(PLATFORM), windows)
@@ -163,7 +161,7 @@
 
 OTHER_INCLUDES += -I$(LAUNCHER_SHARE_SRC)
 OTHER_INCLUDES += -I$(LAUNCHER_PLATFORM_SRC)
-ifndef USE_SYSTEM_ZLIB
+ifneq ($(SYSTEM_ZLIB),true)
   OTHER_INCLUDES += -I$(ZIP_SRC)
 else # !SYSTEM_ZLIB
   LDLIBS += $(ZLIB_LIBS)
@@ -223,7 +221,7 @@
 library:: $(STATIC_LIBRARY)
 
 vpath %.c $(LAUNCHER_SHARE_SRC) $(LAUNCHER_PLATFORM_SRC)
-ifndef USE_SYSTEM_ZLIB
+ifneq ($(SYSTEM_ZLIB),true)
   vpath %.c $(ZIP_SRC)
 else # !SYSTEM_ZLIB
   #
--- a/make/java/zip/FILES_c.gmk	Wed Oct 24 15:12:14 2012 +0100
+++ b/make/java/zip/FILES_c.gmk	Wed Oct 24 20:24:37 2012 +0100
@@ -31,7 +31,7 @@
 	ZipFile.c \
 	zip_util.c
 
-ifndef USE_SYSTEM_ZLIB
+ifneq ($(SYSTEM_ZLIB),true)
 FILES_c += \
 	compress.c \
 	deflate.c \
--- a/make/java/zip/Makefile	Wed Oct 24 15:12:14 2012 +0100
+++ b/make/java/zip/Makefile	Wed Oct 24 20:24:37 2012 +0100
@@ -81,7 +81,7 @@
 CPPFLAGS += -I$(SHARE_SRC)/native/java/io
 CPPFLAGS += -I$(PLATFORM_SRC)/native/java/io
 
-ifndef USE_SYSTEM_ZLIB
+ifneq ($(SYSTEM_ZLIB),true)
 CPPFLAGS += -I$(SHARE_SRC)/native/java/util/zip/zlib-$(ZLIB_VERSION)
 
 #
--- a/make/jdk_generic_profile.sh	Wed Oct 24 15:12:14 2012 +0100
+++ b/make/jdk_generic_profile.sh	Wed Oct 24 20:24:37 2012 +0100
@@ -381,6 +381,24 @@
   fi
 fi
 
+# Export variables for system zlib
+# ZLIB_CFLAGS and ZLIB_LIBS tell the compiler how to compile and
+# link against zlib
+pkgconfig=$(which pkg-config 2>/dev/null)
+if [ -x "${pkgconfig}" ] ; then
+  if [ "${ZLIB_CFLAGS}" = "" ] ; then
+    ZLIB_CFLAGS=$("${pkgconfig}" --cflags zlib)
+  fi
+  if [ "${ZLIB_LIBS}" = "" ] ; then
+    ZLIB_LIBS=$("${pkgconfig}" --libs zlib)
+  fi
+fi
+if [ "${ZLIB_LIBS}" = "" ] ; then
+    ZLIB_LIBS="-lz"
+fi
+export ZLIB_CFLAGS
+export ZLIB_LIBS
+
 # Export variables for system LCMS
 # LCMS_CFLAGS and LCMS_LIBS tell the compiler how to compile and
 # link against lcms2
@@ -399,24 +417,6 @@
 export LCMS_CFLAGS
 export LCMS_LIBS
 
-# Export variables for system zlib
-# ZLIB_CFLAGS and ZLIB_LIBS tell the compiler how to compile and
-# link against zlib
-pkgconfig=$(which pkg-config 2>/dev/null)
-if [ -x "${pkgconfig}" ] ; then
-  if [ "${ZLIB_CFLAGS}" = "" ] ; then
-    ZLIB_CFLAGS=$("${pkgconfig}" --cflags zlib)
-  fi
-  if [ "${ZLIB_LIBS}" = "" ] ; then
-    ZLIB_LIBS=$("${pkgconfig}" --libs zlib)
-  fi
-fi
-if [ "${ZLIB_LIBS}" = "" ] ; then
-    ZLIB_LIBS="-lz"
-fi
-export ZLIB_CFLAGS
-export ZLIB_LIBS
-
 # Export variables for system jpeg
 # JPEG_CFLAGS and JPEG_LIBS tell the compiler how to compile and
 # link against libjpeg
@@ -453,7 +453,7 @@
 
 # IcedTea defaults; use system libraries
 export USE_SYSTEM_LCMS=true
-export USE_SYSTEM_ZLIB=true
+export SYSTEM_ZLIB=true
 export USE_SYSTEM_JPEG=true
 export USE_SYSTEM_PNG=true
 export USE_SYSTEM_GIF=true
--- a/make/sun/splashscreen/FILES_c.gmk	Wed Oct 24 15:12:14 2012 +0100
+++ b/make/sun/splashscreen/FILES_c.gmk	Wed Oct 24 20:24:37 2012 +0100
@@ -32,7 +32,7 @@
 	splashscreen_png.c \
 	splashscreen_sys.c
 
-ifndef USE_SYSTEM_ZLIB
+ifneq ($(SYSTEM_ZLIB),true)
   FILES_c += \
 	compress.c \
 	deflate.c \
--- a/make/sun/splashscreen/Makefile	Wed Oct 24 15:12:14 2012 +0100
+++ b/make/sun/splashscreen/Makefile	Wed Oct 24 20:24:37 2012 +0100
@@ -106,7 +106,7 @@
 ifndef USE_SYSTEM_GIF
   vpath %.c   $(SHARE_SRC)/native/$(PKGDIR)/giflib
 endif
-ifndef USE_SYSTEM_ZLIB
+ifneq ($(SYSTEM_ZLIB),true)
   vpath %.c   $(SHARE_SRC)/native/java/util/zip/zlib-$(ZLIB_VERSION)
 endif
 ifndef USE_SYSTEM_PNG
@@ -130,10 +130,10 @@
 CPPFLAGS += -I$(SHARE_SRC)/native/$(PKGDIR)/splashscreen
 
 ifneq ($(SYSTEM_ZLIB),true)
+  CPPFLAGS += -I$(SHARE_SRC)/native/java/util/zip/zlib-$(ZLIB_VERSION)
+else
   OTHER_CFLAGS += $(ZLIB_CFLAGS)
   OTHER_LDLIBS += $(ZLIB_LIBS)
-else
-  CPPFLAGS += -I$(SHARE_SRC)/native/java/util/zip/zlib-$(ZLIB_VERSION)
 endif
 
 ifdef USE_SYSTEM_JPEG