[pkgsrc/trunk]: pkgsrc/lang/openjdk8 Allow passing LIBZ in the environment. ...

[jperkin <jperkin%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/11e667ef44e0
branches:  trunk
changeset: 349359:11e667ef44e0
user:      jperkin <jperkin%pkgsrc.org@localhost>
date:      Tue Jul 05 14:32:21 2016 +0000

description:
Allow passing LIBZ in the environment.  Skip checking libinstrument.so
which is resolved at runtime.  Fixes build on SunOS at least.

diffstat:

 lang/openjdk8/Makefile                                     |   3 +-
 lang/openjdk8/distinfo                                     |   3 +-
 lang/openjdk8/patches/patch-jdk_make_lib_CoreLibraries.gmk |  15 ++++++++++++++
 3 files changed, 19 insertions(+), 2 deletions(-)

diffs (53 lines):

diff -r fafe09c46d17 -r 11e667ef44e0 lang/openjdk8/Makefile
--- a/lang/openjdk8/Makefile    Tue Jul 05 12:34:12 2016 +0000
+++ b/lang/openjdk8/Makefile    Tue Jul 05 14:32:21 2016 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2016/06/10 10:12:49 tnn Exp $
+# $NetBSD: Makefile,v 1.37 2016/07/05 14:32:21 jperkin Exp $
 
 DISTNAME=      openjdk-1.8.92-20160506
 PKGNAME=       openjdk8-1.8.92
@@ -37,6 +37,7 @@
 UNLIMIT_RESOURCES=     datasize stacksize
 WRKSRC=                        ${WRKDIR}/openjdk
 PLIST_SRC+=            ${PLIST_SRC_DFLT}
+CHECK_SHLIBS_SKIP+=    java/openjdk8/jre/lib/${LIBDIR_ARCH}/libinstrument.so
 
 BUILDLINK_PASSTHRU_DIRS+=      ${ALT_BOOTDIR}
 PREPEND_PATH+=                 ${ALT_BOOTDIR}/bin
diff -r fafe09c46d17 -r 11e667ef44e0 lang/openjdk8/distinfo
--- a/lang/openjdk8/distinfo    Tue Jul 05 12:34:12 2016 +0000
+++ b/lang/openjdk8/distinfo    Tue Jul 05 14:32:21 2016 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.37 2016/05/06 13:37:01 ryoon Exp $
+$NetBSD: distinfo,v 1.38 2016/07/05 14:32:21 jperkin Exp $
 
 SHA1 (openjdk7/bootstrap-jdk-1.7.76-freebsd-10-amd64-20150301.tar.xz) = 7408f52d3bbe35c2b14bbd3215cbf60f1335d334
 RMD160 (openjdk7/bootstrap-jdk-1.7.76-freebsd-10-amd64-20150301.tar.xz) = 24f1577b5fc86d137f070aedb4610c8c89e45815
@@ -105,6 +105,7 @@
 SHA1 (patch-jdk_make_GenerateSources.gmk) = ec1b64805afb6edca637d87529b1d3fa59d20828
 SHA1 (patch-jdk_make_Images.gmk) = e6643dcb25ad5457efe610f6ab7fd0ccc9b5ed41
 SHA1 (patch-jdk_make_lib_Awt2dLibraries.gmk) = ea107ae5e396263489cac9b058bcdd92891baeac
+SHA1 (patch-jdk_make_lib_CoreLibraries.gmk) = 839197feea5ccc9ede70c2c454199fa5ca00c500
 SHA1 (patch-jdk_make_lib_NioLibraries.gmk) = 5a1044c444e534d627b46d820d27bb545e65959d
 SHA1 (patch-jdk_make_lib_SoundLibraries.gmk) = b63cf0ebe204acf7264704916df875a31de84393
 SHA1 (patch-jdk_src_share_lib_security_java.security-bsd) = 5a64fc1205a5bd2f6586ad65ca21f93dfffb1606
diff -r fafe09c46d17 -r 11e667ef44e0 lang/openjdk8/patches/patch-jdk_make_lib_CoreLibraries.gmk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/openjdk8/patches/patch-jdk_make_lib_CoreLibraries.gmk        Tue Jul 05 14:32:21 2016 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-jdk_make_lib_CoreLibraries.gmk,v 1.1 2016/07/05 14:32:21 jperkin Exp $
+
+Allow passing LIBZ in the environment.
+
+--- jdk/make/lib/CoreLibraries.gmk.orig        2016-05-06 12:11:21.000000000 +0000
++++ jdk/make/lib/CoreLibraries.gmk
+@@ -231,7 +231,7 @@ $(BUILD_LIBJAVA): $(BUILD_LIBFDLIBM)
+ 
+ BUILD_LIBZIP_EXCLUDES :=
+ ifeq ($(USE_EXTERNAL_LIBZ), true)
+-  LIBZ := -lz
++  #LIBZ := -lz
+   LIBZIP_EXCLUDES += zlib-1.2.8
+ else
+   ZLIB_CPPFLAGS := -I$(JDK_TOPDIR)/src/share/native/java/util/zip/zlib-1.2.8