/hg/icedtea7: Integrate updated system library provisioning for ...
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Tue Sep 6 08:06:43 PDT 2011
changeset 0af3b9f0e92e in /hg/icedtea7
details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=0af3b9f0e92e
author: Andrew John Hughes <ahughes at redhat.com>
date: Tue Sep 06 16:06:22 2011 +0100
Integrate updated system library provisioning for zlib, libpng,
libjpeg and giflib. PR770: Zero 7033954 regression: missing mapfile
2011-09-06 Andrew John Hughes <ahughes at redhat.com>
* patches/hotspot-gcc-pr36917.patch: Redundant, was
removed from IcedTea6.
* patches/libraries.patch,
* patches/linker-libs-order.patch,
* patches/pr261.patch: Updated and recreated in the IcedTea7
forest.
* Makefile.am: (JDK_CHANGESET): Updated.
(JDK_SHA256SUM): Likewise. (ICEDTEA_PATCHES): Remove above.
(ICEDTEA_ENV): Set ZLIB_LIBS, ZLIB_CFLAGS, USE_SYSTEM_ZLIB,
JPEG_LIBS, JPEG_CFLAGS, USE_SYSTEM_JPEG, PNG_LIBS,
PNG_CFLAGS, USE_SYSTEM_PNG, GIF_LIBS, GIF_CFLAGS,
USE_SYSTEM_GIF.
* NEWS: Mention new system library provision and cleanup
ordering. Mention fix for PR770.
* acinclude.m4: (IT_CHECK_FOR_ZLIB): New macro to check for
zlib. (IT_CHECK_FOR_JPEG): Likewise for libjpeg.
(IT_CHECK_FOR_PNG): Likewise for libpng. (IT_CHECK_FOR_GIF):
Likewise for giflib.
* configure.ac: Remove old AC_CHECK_LIB calls for jpeg, gif
and zlib and PKG_CHECK_MODULES call for libpng. Add calls to
new macros above.
* remove-intree-libraries.sh.in: Make removal of zlib, libpng,
giflib and libjpeg files dependent on whether or not the
system versions are used (the default).
diffstat:
ChangeLog | 33 +
Makefile.am | 36 +-
NEWS | 4 +-
acinclude.m4 | 102 +++
configure.ac | 27 +-
patches/hotspot-gcc-pr36917.patch | 8 -
patches/libraries.patch | 1257 -------------------------------------
patches/linker-libs-order.patch | 52 -
patches/pr261.patch | 38 -
remove-intree-libraries.sh.in | 73 +-
10 files changed, 195 insertions(+), 1435 deletions(-)
diffs (truncated from 1797 to 500 lines):
diff -r 8e4f97b246e8 -r 0af3b9f0e92e ChangeLog
--- a/ChangeLog Mon Sep 05 12:59:28 2011 +0200
+++ b/ChangeLog Tue Sep 06 16:06:22 2011 +0100
@@ -1,3 +1,36 @@
+2011-09-06 Andrew John Hughes <ahughes at redhat.com>
+
+ * patches/hotspot-gcc-pr36917.patch:
+ Redundant, was removed from IcedTea6.
+ * patches/libraries.patch,
+ * patches/linker-libs-order.patch,
+ * patches/pr261.patch:
+ Updated and recreated in the IcedTea7 forest.
+ * Makefile.am:
+ (JDK_CHANGESET): Updated.
+ (JDK_SHA256SUM): Likewise.
+ (ICEDTEA_PATCHES): Remove above.
+ (ICEDTEA_ENV): Set ZLIB_LIBS, ZLIB_CFLAGS,
+ USE_SYSTEM_ZLIB, JPEG_LIBS, JPEG_CFLAGS,
+ USE_SYSTEM_JPEG, PNG_LIBS, PNG_CFLAGS,
+ USE_SYSTEM_PNG, GIF_LIBS, GIF_CFLAGS,
+ USE_SYSTEM_GIF.
+ * NEWS: Mention new system library provision
+ and cleanup ordering. Mention fix for PR770.
+ * acinclude.m4:
+ (IT_CHECK_FOR_ZLIB): New macro to check for zlib.
+ (IT_CHECK_FOR_JPEG): Likewise for libjpeg.
+ (IT_CHECK_FOR_PNG): Likewise for libpng.
+ (IT_CHECK_FOR_GIF): Likewise for giflib.
+ * configure.ac:
+ Remove old AC_CHECK_LIB calls for jpeg, gif
+ and zlib and PKG_CHECK_MODULES call for libpng.
+ Add calls to new macros above.
+ * remove-intree-libraries.sh.in:
+ Make removal of zlib, libpng, giflib and libjpeg
+ files dependent on whether or not the system versions
+ are used (the default).
+
2011-09-05 Xerxes RÃ¥nby <xerxes at zafena.se>
JamVM
diff -r 8e4f97b246e8 -r 0af3b9f0e92e Makefile.am
--- a/Makefile.am Mon Sep 05 12:59:28 2011 +0200
+++ b/Makefile.am Tue Sep 06 16:06:22 2011 +0100
@@ -6,7 +6,7 @@
HOTSPOT_CHANGESET = 1dd9b3d73b22
JAXP_CHANGESET = c40983d6ae70
JAXWS_CHANGESET = 83db5e316798
-JDK_CHANGESET = e46d527097f1
+JDK_CHANGESET = db7a2639858b
LANGTOOLS_CHANGESET = fb7fb3071b64
OPENJDK_CHANGESET = 3defd24c2671
@@ -14,7 +14,7 @@
HOTSPOT_SHA256SUM = ffb1831a63e950bb7ade46a5382cb71d2603e0f40b3f758eb346833e18fca150
JAXP_SHA256SUM = 6ab0cab1965edb28e4093b55436abd04fbffe0b0251016043c75246c4ee9dc2d
JAXWS_SHA256SUM = 5567c90ce2857016365b2e346783a3b16ec0e76b80586a0371f601b4fed01f21
-JDK_SHA256SUM = 0cd074fb2400c95d013373847b5c52bb13997acbb6530507e384856583e1abd4
+JDK_SHA256SUM = 81b510c80f3af0a1cd19704c616a68ff131362b517996ae65cb91c9a5849fcdc
LANGTOOLS_SHA256SUM = 9ddc00ec50fd2f5e331dc2bc10da4e23b69bf644eb92d50b39a2003c18fb5aa1
OPENJDK_SHA256SUM = 4043a75c2c4385dd735f8dbbf2369311ce1b951217c9dbe9bba9609e24eb291e
@@ -246,13 +246,11 @@
# Patch list
ICEDTEA_PATCHES = \
- patches/libraries.patch \
patches/debian/uname.patch \
patches/sparc-ptracefix.patch \
patches/sparc-trapsfix.patch \
patches/override-redirect-metacity.patch \
patches/security-updates.patch \
- patches/hotspot-gcc-pr36917.patch \
patches/alpha-fixes.patch \
patches/alt-jar.patch \
patches/use-idx_t.patch \
@@ -262,9 +260,7 @@
patches/signed-types.patch \
patches/lc_ctype.patch \
patches/tests-jdk.patch \
- patches/linker-libs-order.patch \
patches/samejvm-safe.patch \
- patches/pr261.patch \
patches/parisc-opt.patch \
patches/security/6592792.patch \
patches/security/6733959.patch \
@@ -515,6 +511,13 @@
RHINO_JAR="$(abs_top_builddir)/rhino/rhino.jar"
endif
+if USE_SYSTEM_ZLIB
+ICEDTEA_ENV += \
+ USE_SYSTEM_ZLIB="true" \
+ ZLIB_LIBS="${ZLIB_LIBS}" \
+ ZLIB_CFLAGS="${ZLIB_CFLAGS}"
+endif
+
if USE_SYSTEM_LCMS
ICEDTEA_ENV += \
USE_SYSTEM_LCMS="true" \
@@ -522,6 +525,27 @@
LCMS_CFLAGS="${LCMS2_CFLAGS}"
endif
+if USE_SYSTEM_JPEG
+ICEDTEA_ENV += \
+ USE_SYSTEM_JPEG="true" \
+ JPEG_LIBS="${JPEG_LIBS}" \
+ JPEG_CFLAGS="${JPEG_CFLAGS}"
+endif
+
+if USE_SYSTEM_PNG
+ICEDTEA_ENV += \
+ USE_SYSTEM_PNG="true" \
+ PNG_LIBS="${PNG_LIBS}" \
+ PNG_CFLAGS="${PNG_CFLAGS}"
+endif
+
+if USE_SYSTEM_GIF
+ICEDTEA_ENV += \
+ USE_SYSTEM_GIF="true" \
+ GIF_LIBS="${GIF_LIBS}" \
+ GIF_CFLAGS="${GIF_CFLAGS}"
+endif
+
# OpenJDK boot build environment.
ICEDTEA_ENV_BOOT = $(ICEDTEA_ENV) \
BOOTCLASSPATH_CLS_RT="-bootclasspath $(CLS_DIR_BOOT):$(RUNTIME)" \
diff -r 8e4f97b246e8 -r 0af3b9f0e92e NEWS
--- a/NEWS Mon Sep 05 12:59:28 2011 +0200
+++ b/NEWS Tue Sep 06 16:06:22 2011 +0100
@@ -13,10 +13,11 @@
New in release 2.0 (2011-XX-XX):
* Bug fixes
- - PR767: Annotation Processing Filer.getResource() always throws FileNotFoundException
- Allow the compiler used to be overridden by setting BUILD_GCC/BUILD_CPP.
- Fixed regression test runtime/7020373.
+ - Convert to optional system library usage via USE_SYSTEM_ZLIB/JPEG/PNG/GIF.
- PR586: Add missing sources to src.zip.
+ - PR767: Annotation Processing Filer.getResource() always throws FileNotFoundException
- G356743: Support building against libpng 1.5.
- S7070134: Hotspot crashes with sigsegv from PorterStemmer
- S7044738: Loop unroll optimization causes incorrect result
@@ -25,6 +26,7 @@
* Zero/Shark
- PR757, 7066143: 7009309 regression: x86 stubRoutines
- PR753, 7066143: 7009923 regression
+ - PR770: Zero 7033954 regression: missing mapfile
- methodHandles_zero missing.
- sharkContext typo in assert
- sharedRuntime needs rework after indy reorg
diff -r 8e4f97b246e8 -r 0af3b9f0e92e acinclude.m4
--- a/acinclude.m4 Mon Sep 05 12:59:28 2011 +0200
+++ b/acinclude.m4 Tue Sep 06 16:06:22 2011 +0100
@@ -1956,6 +1956,108 @@
AC_SUBST(ENABLE_SYSTEM_LCMS)
])
+AC_DEFUN_ONCE([IT_CHECK_FOR_ZLIB],
+[
+ AC_MSG_CHECKING([whether to use the system zlib install])
+ AC_ARG_ENABLE([system-zlib],
+ [AS_HELP_STRING(--enable-system-zlib,use the system ZLIB [[default=yes]])],
+ [
+ ENABLE_SYSTEM_ZLIB="${enableval}"
+ ],
+ [
+ ENABLE_SYSTEM_ZLIB="yes"
+ ])
+ AC_MSG_RESULT(${ENABLE_SYSTEM_ZLIB})
+ if test x"${ENABLE_SYSTEM_ZLIB}" = "xyes"; then
+ dnl Check for ZLIB headers and libraries.
+ PKG_CHECK_MODULES(ZLIB, zlib,[ZLIB_FOUND=yes],[ZLIB_FOUND=no])
+ if test "x${ZLIB_FOUND}" = xno
+ then
+ AC_MSG_ERROR([Could not find ZLIB; install ZLIB or build with --disable-system-zlib to use the in-tree copy.])
+ fi
+ AC_SUBST(ZLIB_CFLAGS)
+ AC_SUBST(ZLIB_LIBS)
+ fi
+ AM_CONDITIONAL(USE_SYSTEM_ZLIB, test x"${ENABLE_SYSTEM_ZLIB}" = "xyes")
+ AC_SUBST(ENABLE_SYSTEM_ZLIB)
+])
+
+AC_DEFUN_ONCE([IT_CHECK_FOR_JPEG],
+[
+ AC_MSG_CHECKING([whether to use the system jpeg install])
+ AC_ARG_ENABLE([system-jpeg],
+ [AS_HELP_STRING(--enable-system-jpeg,use the system libjpeg [[default=yes]])],
+ [
+ ENABLE_SYSTEM_JPEG="${enableval}"
+ ],
+ [
+ ENABLE_SYSTEM_JPEG="yes"
+ ])
+ AC_MSG_RESULT(${ENABLE_SYSTEM_JPEG})
+ if test x"${ENABLE_SYSTEM_JPEG}" = "xyes"; then
+ dnl Check for JPEG headers and libraries.
+ AC_CHECK_LIB([jpeg], [main],
+ , [AC_MSG_ERROR("Could not find JPEG library; install JPEG or build with --disable-system-jpeg to use the in-tree copy.")])
+ AC_CHECK_HEADER([jpeglib.h],
+ , [AC_MSG_ERROR("Could not find JPEG header; install JPEG or build with --disable-system-jpeg to use the in-tree copy.")])
+ JPEG_LIBS="-ljpeg"
+ AC_SUBST(JPEG_LIBS)
+ fi
+ AM_CONDITIONAL(USE_SYSTEM_JPEG, test x"${ENABLE_SYSTEM_JPEG}" = "xyes")
+ AC_SUBST(ENABLE_SYSTEM_JPEG)
+])
+
+AC_DEFUN_ONCE([IT_CHECK_FOR_PNG],
+[
+ AC_MSG_CHECKING([whether to use the system libpng install])
+ AC_ARG_ENABLE([system-png],
+ [AS_HELP_STRING(--enable-system-png,use the system PNG [[default=yes]])],
+ [
+ ENABLE_SYSTEM_PNG="${enableval}"
+ ],
+ [
+ ENABLE_SYSTEM_PNG="yes"
+ ])
+ AC_MSG_RESULT(${ENABLE_SYSTEM_PNG})
+ if test x"${ENABLE_SYSTEM_PNG}" = "xyes"; then
+ dnl Check for PNG headers and libraries.
+ PKG_CHECK_MODULES(PNG, libpng,[LIBPNG_FOUND=yes],[LIBPNG_FOUND=no])
+ if test "x${LIBPNG_FOUND}" = xno
+ then
+ AC_MSG_ERROR([Could not find libpng; install libpng or build with --disable-system-png to use the in-tree copy.])
+ fi
+ AC_SUBST(PNG_CFLAGS)
+ AC_SUBST(PNG_LIBS)
+ fi
+ AM_CONDITIONAL(USE_SYSTEM_PNG, test x"${ENABLE_SYSTEM_PNG}" = "xyes")
+ AC_SUBST(ENABLE_SYSTEM_PNG)
+])
+
+AC_DEFUN_ONCE([IT_CHECK_FOR_GIF],
+[
+ AC_MSG_CHECKING([whether to use the system giflib install])
+ AC_ARG_ENABLE([system-gif],
+ [AS_HELP_STRING(--enable-system-gif,use the system giflib [[default=yes]])],
+ [
+ ENABLE_SYSTEM_GIF="${enableval}"
+ ],
+ [
+ ENABLE_SYSTEM_GIF="yes"
+ ])
+ AC_MSG_RESULT(${ENABLE_SYSTEM_GIF})
+ if test x"${ENABLE_SYSTEM_GIF}" = "xyes"; then
+ dnl Check for GIF headers and libraries.
+ AC_CHECK_LIB([gif], [main],
+ , [AC_MSG_ERROR("Could not find GIF library; install GIF or build with --disable-system-gif to use the in-tree copy.")])
+ AC_CHECK_HEADER([gif_lib.h],
+ , [AC_MSG_ERROR("Could not find GIF header; install GIF or build with --disable-system-gif to use the in-tree copy.")])
+ GIF_LIBS="-lgif"
+ AC_SUBST(GIF_LIBS)
+ fi
+ AM_CONDITIONAL(USE_SYSTEM_GIF, test x"${ENABLE_SYSTEM_GIF}" = "xyes")
+ AC_SUBST(ENABLE_SYSTEM_GIF)
+])
+
AC_DEFUN([IT_ENABLE_JAMVM],
[
AC_MSG_CHECKING(whether to use JamVM as VM)
diff -r 8e4f97b246e8 -r 0af3b9f0e92e configure.ac
--- a/configure.ac Mon Sep 05 12:59:28 2011 +0200
+++ b/configure.ac Tue Sep 06 16:06:22 2011 +0100
@@ -167,12 +167,13 @@
AC_CHECK_HEADERS([X11/X.h],[]
,[AC_MSG_ERROR("xorg headers were not found -
try installing xorg-x11-proto-devel.")])
-AC_CHECK_LIB(jpeg, main,
- , [AC_MSG_ERROR("libjpeg not found - try installing libjpeg-devel")])
-AC_CHECK_LIB(gif, main,
- , [AC_MSG_ERROR("giflib not found - try installing giflib-devel")])
-AC_CHECK_LIB(z, main,
- , [AC_MSG_ERROR("zlib not found - try installing zlib-devel")])
+
+IT_CHECK_FOR_ZLIB
+IT_CHECK_FOR_JPEG
+IT_CHECK_FOR_PNG
+IT_CHECK_FOR_GIF
+IT_CHECK_FOR_LCMS
+AC_CONFIG_FILES([remove-intree-libraries.sh])
dnl Check for Xproto headers and libraries.
PKG_CHECK_MODULES(XPROTO, xproto,[XPROTO_FOUND=yes],[XPROTO_FOUND=no])
@@ -296,17 +297,6 @@
AC_CONFIG_FILES([tapset/jstack.stp])
fi
-dnl Check for libpng headers and libraries.
-PKG_CHECK_MODULES(LIBPNG, libpng,[LIBPNG_FOUND=yes]
- ,[LIBPNG_FOUND=no])
-if test "x${LIBPNG_FOUND}" = xno
-then
- AC_MSG_ERROR([Could not find libpng - \
- Try installing libpng-devel.])
-fi
-AC_SUBST(LIBPNG_CFLAGS)
-AC_SUBST(LIBPNG_LIBS)
-
dnl Check for libXtst headers and libraries.
PKG_CHECK_MODULES(XTST, xtst,[XTST_FOUND=yes],[XTST_FOUND=no])
if test "x${XTST_FOUND}" = xno
@@ -440,9 +430,6 @@
AC_SUBST(LLVM_LDFLAGS)
AC_SUBST(LLVM_LIBS)
-IT_CHECK_FOR_LCMS
-AC_CONFIG_FILES([remove-intree-libraries.sh])
-
# Arguments passed to configure.
AC_SUBST(CONFIGURE_ARGS)
CONFIGURE_ARGS="$ac_configure_args"
diff -r 8e4f97b246e8 -r 0af3b9f0e92e patches/hotspot-gcc-pr36917.patch
--- a/patches/hotspot-gcc-pr36917.patch Mon Sep 05 12:59:28 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,9 +0,0 @@
---- openjdk/hotspot/make/linux/makefiles/i486.make~ 2008-07-10 22:04:18.000000000 +0200
-+++ openjdk/hotspot/make/linux/makefiles/i486.make 2008-07-24 12:23:11.344839305 +0200
-@@ -34,3 +34,6 @@
- CFLAGS += -DVM_LITTLE_ENDIAN
-
- OPT_CFLAGS/compactingPermGenGen.o = -O1
-+
-+# GCC PR tree-optimization/36917
-+OPT_CFLAGS/ciTypeFlow.o += $(OPT_CFLAGS) -fno-ivopts
diff -r 8e4f97b246e8 -r 0af3b9f0e92e patches/libraries.patch
--- a/patches/libraries.patch Mon Sep 05 12:59:28 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1277 +0,0 @@
-diff -Nru openjdk.orig/jdk/make/com/sun/java/pack/Makefile openjdk/jdk/make/com/sun/java/pack/Makefile
---- openjdk.orig/jdk/make/com/sun/java/pack/Makefile 2011-06-11 00:38:06.000000000 +0100
-+++ openjdk/jdk/make/com/sun/java/pack/Makefile 2011-06-13 15:12:16.465040427 +0100
-@@ -70,12 +70,10 @@
- $(ZIPOBJDIR)/inftrees.$(OBJECT_SUFFIX) \
- $(ZIPOBJDIR)/inffast.$(OBJECT_SUFFIX)
-
-- ZINCLUDE=-I$(SHARE_SRC)/native/java/util/zip/zlib-$(ZLIB_VERSION)
-- OTHER_CXXFLAGS += $(ZINCLUDE)
-- LDDFLAGS += $(ZIPOBJS)
-+ OTHER_LDLIBS += -lz
- else
- OTHER_CXXFLAGS += -DNO_ZLIB -DUNPACK_JNI
-- OTHER_LDLIBS += $(JVMLIB)
-+ OTHER_LDLIBS += -lz $(JVMLIB)
- endif
-
- CXXFLAGS_DBG += -DFULL
-@@ -94,12 +92,12 @@
- RES = $(OBJDIR)/$(PGRM).res
- else
- LDOUTPUT = -o #Have a space
-- LDDFLAGS += -lc
-+ LDDFLAGS += -lz -lc
- OTHER_LDLIBS += $(LIBCXX)
- # setup the list of libraries to link in...
- ifeq ($(PLATFORM), linux)
- ifeq ("$(CC_VER_MAJOR)", "3")
-- OTHER_LDLIBS += -Wl,-Bstatic -lgcc_eh -Wl,-Bdynamic
-+ OTHER_LDLIBS += -lz -Wl,-Bstatic -lgcc_eh -Wl,-Bdynamic
- endif
- endif #LINUX
- endif #PLATFORM
-diff -Nru openjdk.orig/jdk/make/common/Program.gmk openjdk/jdk/make/common/Program.gmk
---- openjdk.orig/jdk/make/common/Program.gmk 2011-06-11 00:38:06.000000000 +0100
-+++ openjdk/jdk/make/common/Program.gmk 2011-06-13 15:12:16.465040427 +0100
-@@ -91,6 +91,7 @@
- endif
- endif
- ifeq ($(PLATFORM), linux)
-+ LDFLAGS += -lz
- LDFLAGS += $(LDFLAG_Z_ORIGIN)
- LDFLAGS += -Wl,--allow-shlib-undefined
- LDFLAGS += -Wl,-rpath -Wl,\$$ORIGIN/../lib/$(LIBARCH)/jli
-@@ -247,7 +248,6 @@
- endif
-
- OTHER_INCLUDES += -I$(LAUNCHER_SHARE_SRC)/bin -I$(LAUNCHER_PLATFORM_SRC)/bin
--OTHER_INCLUDES += -I$(SHARE_SRC)/native/java/util/zip/zlib-1.1.3
-
- OTHER_CPPFLAGS += -DPROGNAME='"$(PROGRAM)"'
- VERSION_DEFINES += -DFULL_VERSION='"$(FULL_VERSION)"'
-diff -Nru openjdk.orig/jdk/make/java/jli/Makefile openjdk/jdk/make/java/jli/Makefile
---- openjdk.orig/jdk/make/java/jli/Makefile 2011-06-11 00:38:06.000000000 +0100
-+++ openjdk/jdk/make/java/jli/Makefile 2011-06-13 15:12:16.465040427 +0100
-@@ -44,7 +44,6 @@
-
- include $(BUILDDIR)/common/Defs.gmk
-
--ZIP_SRC = $(SHARE_SRC)/native/java/util/zip/zlib-$(ZLIB_VERSION)
- LAUNCHER_SHARE_SRC = $(SHARE_SRC)/bin
- LAUNCHER_PLATFORM_SRC = $(PLATFORM_SRC)/bin
-
-@@ -69,13 +68,7 @@
- parse_manifest.c \
- version_comp.c \
- wildcard.c \
-- jli_util.c \
-- inflate.c \
-- inftrees.c \
-- inffast.c \
-- zadler32.c \
-- zcrc32.c \
-- zutil.c
-+ jli_util.c
-
- ifneq ($(PLATFORM), windows)
- FILES_c += ergo.c
-@@ -105,7 +98,7 @@
- # Note: its important to keep this order meaning -lc is the
- # last library otherwise it could cause compatibility issues
- # by pulling in SUNW_private symbols from libc
-- LDLIBS = -ldl -lc
-+ LDLIBS = -ldl -lz -lc
- ifeq ($(USE_PTHREADS),true)
- LDLIBS += -lpthread
- endif # USE_PTHREADS
-@@ -129,7 +122,6 @@
-
- OTHER_INCLUDES += -I$(LAUNCHER_SHARE_SRC)
- OTHER_INCLUDES += -I$(LAUNCHER_PLATFORM_SRC)
--OTHER_INCLUDES += -I$(ZIP_SRC)
-
- #
- # Library to compile.
-@@ -164,4 +156,4 @@
- #
- # Add to ambient vpath so we pick up the library files
- #
--vpath %.c $(LAUNCHER_SHARE_SRC) $(ZIP_SRC) $(LAUNCHER_PLATFORM_SRC)
-+vpath %.c $(LAUNCHER_SHARE_SRC) $(LAUNCHER_PLATFORM_SRC)
-diff -Nru openjdk.orig/jdk/make/java/zip/FILES_c.gmk openjdk/jdk/make/java/zip/FILES_c.gmk
---- openjdk.orig/jdk/make/java/zip/FILES_c.gmk 2010-07-29 21:55:27.000000000 +0100
-+++ openjdk/jdk/make/java/zip/FILES_c.gmk 2011-06-13 15:12:16.477040613 +0100
-@@ -29,16 +29,4 @@
- Deflater.c \
- Inflater.c \
- ZipFile.c \
-- zip_util.c \
-- compress.c \
-- deflate.c \
-- gzio.c \
-- infback.c \
-- inffast.c \
-- inflate.c \
-- inftrees.c \
-- trees.c \
-- uncompr.c \
-- zadler32.c \
-- zcrc32.c \
-- zutil.c
-+ zip_util.c
-diff -Nru openjdk.orig/jdk/make/java/zip/Makefile openjdk/jdk/make/java/zip/Makefile
---- openjdk.orig/jdk/make/java/zip/Makefile 2011-06-11 00:38:06.000000000 +0100
-+++ openjdk/jdk/make/java/zip/Makefile 2011-06-13 15:12:16.477040613 +0100
-@@ -74,16 +74,10 @@
- CPPFLAGS += -UDEBUG
- endif
-
--CPPFLAGS += -I$(SHARE_SRC)/native/java/util/zip/zlib-$(ZLIB_VERSION)
- CPPFLAGS += -I$(SHARE_SRC)/native/java/io
- CPPFLAGS += -I$(PLATFORM_SRC)/native/java/io
-
- #
--# Add to ambient vpath so we pick up the library files
--#
--vpath %.c $(SHARE_SRC)/native/$(PKGDIR)/zlib-$(ZLIB_VERSION)
--
--#
- # Link to JVM library for JVM_Zip* functions
- #
--OTHER_LDLIBS = $(JVMLIB)
-+OTHER_LDLIBS = $(JVMLIB) -lz
-diff -Nru openjdk.orig/jdk/make/sun/jpeg/FILES_c.gmk openjdk/jdk/make/sun/jpeg/FILES_c.gmk
---- openjdk.orig/jdk/make/sun/jpeg/FILES_c.gmk 2010-07-29 21:55:29.000000000 +0100
-+++ openjdk/jdk/make/sun/jpeg/FILES_c.gmk 2011-06-13 15:12:16.477040613 +0100
-@@ -25,51 +25,7 @@
-
- FILES_c = \
- imageioJPEG.c \
-- jpegdecoder.c \
-- jcomapi.c \
-- jdapimin.c \
-- jdapistd.c \
-- jdcoefct.c \
-- jdcolor.c \
-- jddctmgr.c \
-- jdhuff.c \
-- jdinput.c \
-- jdmainct.c \
-- jdmarker.c \
-- jdmaster.c \
-- jdmerge.c \
-- jdphuff.c \
-- jdpostct.c \
-- jdsample.c \
-- jerror.c \
-- jidctflt.c \
-- jidctfst.c \
More information about the distro-pkg-dev
mailing list