Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mail.netbsd.org", Issuer "Postmaster NetBSD.org" (verified OK)) by mollari.NetBSD.org (Postfix) with ESMTPS id 37B3C7A227 for ; Tue, 5 Jul 2016 14:32:23 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id DA6BF85EA0; Tue, 5 Jul 2016 14:32:22 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 6A62585E9C for ; Tue, 5 Jul 2016 14:32:22 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id 8y1J_nd8Nft1 for ; Tue, 5 Jul 2016 14:32:21 +0000 (UTC) Received: from cvs.NetBSD.org (unknown [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id E33CB84CBD for ; Tue, 5 Jul 2016 14:32:21 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id DE27AFBB5; Tue, 5 Jul 2016 14:32:21 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1467729141227670" MIME-Version: 1.0 Date: Tue, 5 Jul 2016 14:32:21 +0000 From: "Jonathan Perkin" Subject: CVS commit: pkgsrc/lang/openjdk8 To: pkgsrc-changes@NetBSD.org Reply-To: jperkin@netbsd.org X-Mailer: log_accum Message-Id: <20160705143221.DE27AFBB5@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk This is a multi-part message in MIME format. --_----------=_1467729141227670 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: jperkin Date: Tue Jul 5 14:32:21 UTC 2016 Modified Files: pkgsrc/lang/openjdk8: Makefile distinfo Added Files: pkgsrc/lang/openjdk8/patches: patch-jdk_make_lib_CoreLibraries.gmk Log Message: Allow passing LIBZ in the environment. Skip checking libinstrument.so which is resolved at runtime. Fixes build on SunOS at least. To generate a diff of this commit: cvs rdiff -u -r1.36 -r1.37 pkgsrc/lang/openjdk8/Makefile cvs rdiff -u -r1.37 -r1.38 pkgsrc/lang/openjdk8/distinfo cvs rdiff -u -r0 -r1.1 \ pkgsrc/lang/openjdk8/patches/patch-jdk_make_lib_CoreLibraries.gmk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1467729141227670 Content-Disposition: inline Content-Length: 2902 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/lang/openjdk8/Makefile diff -u pkgsrc/lang/openjdk8/Makefile:1.36 pkgsrc/lang/openjdk8/Makefile:1.37 --- pkgsrc/lang/openjdk8/Makefile:1.36 Fri Jun 10 10:12:49 2016 +++ pkgsrc/lang/openjdk8/Makefile Tue Jul 5 14:32:21 2016 @@ -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 @@ USE_TOOLS+= bash gmake pax pkg-config u 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 Index: pkgsrc/lang/openjdk8/distinfo diff -u pkgsrc/lang/openjdk8/distinfo:1.37 pkgsrc/lang/openjdk8/distinfo:1.38 --- pkgsrc/lang/openjdk8/distinfo:1.37 Fri May 6 13:37:01 2016 +++ pkgsrc/lang/openjdk8/distinfo Tue Jul 5 14:32:21 2016 @@ -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_CreateJars.gmk) = 0 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 Added files: Index: pkgsrc/lang/openjdk8/patches/patch-jdk_make_lib_CoreLibraries.gmk diff -u /dev/null pkgsrc/lang/openjdk8/patches/patch-jdk_make_lib_CoreLibraries.gmk:1.1 --- /dev/null Tue Jul 5 14:32:21 2016 +++ pkgsrc/lang/openjdk8/patches/patch-jdk_make_lib_CoreLibraries.gmk Tue Jul 5 14:32:21 2016 @@ -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 --_----------=_1467729141227670--