Tue Jul 5 14:32:21 2016 UTC ()
Allow passing LIBZ in the environment.  Skip checking libinstrument.so
which is resolved at runtime.  Fixes build on SunOS at least.


(jperkin)
diff -r1.36 -r1.37 pkgsrc/lang/openjdk8/Makefile
diff -r1.37 -r1.38 pkgsrc/lang/openjdk8/distinfo
diff -r0 -r1.1 pkgsrc/lang/openjdk8/patches/patch-jdk_make_lib_CoreLibraries.gmk
cvs diff -r1.36 -r1.37 pkgsrc/lang/openjdk8/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/openjdk8/Makefile 2016/06/10 10:12:49 1.36
+++ pkgsrc/lang/openjdk8/Makefile 2016/07/05 14:32:21 1.37
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.36 2016/06/10 10:12:49 tnn Exp $ 1# $NetBSD: Makefile,v 1.37 2016/07/05 14:32:21 jperkin Exp $
2 2
3DISTNAME= openjdk-1.8.92-20160506 3DISTNAME= openjdk-1.8.92-20160506
4PKGNAME= openjdk8-1.8.92 4PKGNAME= openjdk8-1.8.92
5PKGREVISION= 2 5PKGREVISION= 2
6CATEGORIES= lang 6CATEGORIES= lang
7MASTER_SITES= ${MASTER_SITE_LOCAL:=openjdk7/} 7MASTER_SITES= ${MASTER_SITE_LOCAL:=openjdk7/}
8EXTRACT_SUFX= .tar.xz 8EXTRACT_SUFX= .tar.xz
9 9
10MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= http://openjdk.java.net/ 11HOMEPAGE= http://openjdk.java.net/
12COMMENT= Open-source implementation of the Java Platform, Standard Edition 12COMMENT= Open-source implementation of the Java Platform, Standard Edition
13LICENSE= gnu-gpl-v2 13LICENSE= gnu-gpl-v2
14 14
@@ -27,26 +27,27 @@ BUILD_DEPENDS+= mozilla-rootcerts>=1.0. @@ -27,26 +27,27 @@ BUILD_DEPENDS+= mozilla-rootcerts>=1.0.
27 27
28GNU_CONFIGURE= yes 28GNU_CONFIGURE= yes
29CONFIGURE_SCRIPT= common/autoconf/configure 29CONFIGURE_SCRIPT= common/autoconf/configure
30CONFIG_SHELL= bash 30CONFIG_SHELL= bash
31CONFIG_SUB_OVERRIDE+= common/autoconf/build-aux/config.sub 31CONFIG_SUB_OVERRIDE+= common/autoconf/build-aux/config.sub
32CONFIG_GUESS_OVERRIDE+= common/autoconf/build-aux/config.guess 32CONFIG_GUESS_OVERRIDE+= common/autoconf/build-aux/config.guess
33CONFIG_SUB_OVERRIDE+= common/autoconf/build-aux/autoconf-config.sub 33CONFIG_SUB_OVERRIDE+= common/autoconf/build-aux/autoconf-config.sub
34CONFIG_GUESS_OVERRIDE+= common/autoconf/build-aux/autoconf-config.guess 34CONFIG_GUESS_OVERRIDE+= common/autoconf/build-aux/autoconf-config.guess
35USE_LANGUAGES= c c++ 35USE_LANGUAGES= c c++
36USE_TOOLS+= bash gmake pax pkg-config unzip:run zip:run 36USE_TOOLS+= bash gmake pax pkg-config unzip:run zip:run
37UNLIMIT_RESOURCES= datasize stacksize 37UNLIMIT_RESOURCES= datasize stacksize
38WRKSRC= ${WRKDIR}/openjdk 38WRKSRC= ${WRKDIR}/openjdk
39PLIST_SRC+= ${PLIST_SRC_DFLT} 39PLIST_SRC+= ${PLIST_SRC_DFLT}
 40CHECK_SHLIBS_SKIP+= java/openjdk8/jre/lib/${LIBDIR_ARCH}/libinstrument.so
40 41
41BUILDLINK_PASSTHRU_DIRS+= ${ALT_BOOTDIR} 42BUILDLINK_PASSTHRU_DIRS+= ${ALT_BOOTDIR}
42PREPEND_PATH+= ${ALT_BOOTDIR}/bin 43PREPEND_PATH+= ${ALT_BOOTDIR}/bin
43 44
44CONFIGURE_ARGS+= --disable-option-checking # for --with-libiconv-prefix 45CONFIGURE_ARGS+= --disable-option-checking # for --with-libiconv-prefix
45CONFIGURE_ARGS+= --prefix=${PREFIX:Q} 46CONFIGURE_ARGS+= --prefix=${PREFIX:Q}
46CONFIGURE_ARGS+= --build=${MACHINE_GNU_PLATFORM:Q} 47CONFIGURE_ARGS+= --build=${MACHINE_GNU_PLATFORM:Q}
47CONFIGURE_ARGS+= --host=${MACHINE_GNU_PLATFORM:Q} 48CONFIGURE_ARGS+= --host=${MACHINE_GNU_PLATFORM:Q}
48CONFIGURE_ARGS+= --with-boot-jdk=${ALT_BOOTDIR} 49CONFIGURE_ARGS+= --with-boot-jdk=${ALT_BOOTDIR}
49CONFIGURE_ARGS+= --with-zlib=system 50CONFIGURE_ARGS+= --with-zlib=system
50MAKEFLAGS+= LIBZ="${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.zlib}/lib -L${BUILDLINK_PREFIX.zlib}/lib -lz" 51MAKEFLAGS+= LIBZ="${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.zlib}/lib -L${BUILDLINK_PREFIX.zlib}/lib -lz"
51CONFIGURE_ARGS+= --with-giflib=bundled 52CONFIGURE_ARGS+= --with-giflib=bundled
52CONFIGURE_ARGS+= --with-cups=${BUILDLINK_PREFIX.cups} 53CONFIGURE_ARGS+= --with-cups=${BUILDLINK_PREFIX.cups}
cvs diff -r1.37 -r1.38 pkgsrc/lang/openjdk8/distinfo (expand / switch to unified diff)

--- pkgsrc/lang/openjdk8/distinfo 2016/05/06 13:37:01 1.37
+++ pkgsrc/lang/openjdk8/distinfo 2016/07/05 14:32:21 1.38
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: distinfo,v 1.37 2016/05/06 13:37:01 ryoon Exp $ 1$NetBSD: distinfo,v 1.38 2016/07/05 14:32:21 jperkin Exp $
2 2
3SHA1 (openjdk7/bootstrap-jdk-1.7.76-freebsd-10-amd64-20150301.tar.xz) = 7408f52d3bbe35c2b14bbd3215cbf60f1335d334 3SHA1 (openjdk7/bootstrap-jdk-1.7.76-freebsd-10-amd64-20150301.tar.xz) = 7408f52d3bbe35c2b14bbd3215cbf60f1335d334
4RMD160 (openjdk7/bootstrap-jdk-1.7.76-freebsd-10-amd64-20150301.tar.xz) = 24f1577b5fc86d137f070aedb4610c8c89e45815 4RMD160 (openjdk7/bootstrap-jdk-1.7.76-freebsd-10-amd64-20150301.tar.xz) = 24f1577b5fc86d137f070aedb4610c8c89e45815
5SHA512 (openjdk7/bootstrap-jdk-1.7.76-freebsd-10-amd64-20150301.tar.xz) = 6ed928cc68503c27edd6f3a90f94e1e762192d41997b12903e37071f4fcd34f5579fa970e59c240928eaae60729300fbfdb02a5ec1136bc757ee24f1ee554af4 5SHA512 (openjdk7/bootstrap-jdk-1.7.76-freebsd-10-amd64-20150301.tar.xz) = 6ed928cc68503c27edd6f3a90f94e1e762192d41997b12903e37071f4fcd34f5579fa970e59c240928eaae60729300fbfdb02a5ec1136bc757ee24f1ee554af4
6Size (openjdk7/bootstrap-jdk-1.7.76-freebsd-10-amd64-20150301.tar.xz) = 26404752 bytes 6Size (openjdk7/bootstrap-jdk-1.7.76-freebsd-10-amd64-20150301.tar.xz) = 26404752 bytes
7SHA1 (openjdk7/bootstrap-jdk-1.7.76-netbsd-5-amd64-20150301.tar.xz) = 358c533580700065fd5c3c5c99ce3fd087589c00 7SHA1 (openjdk7/bootstrap-jdk-1.7.76-netbsd-5-amd64-20150301.tar.xz) = 358c533580700065fd5c3c5c99ce3fd087589c00
8RMD160 (openjdk7/bootstrap-jdk-1.7.76-netbsd-5-amd64-20150301.tar.xz) = 96e74f40360f0d4c1272bf5f37cf8869b718a5ee 8RMD160 (openjdk7/bootstrap-jdk-1.7.76-netbsd-5-amd64-20150301.tar.xz) = 96e74f40360f0d4c1272bf5f37cf8869b718a5ee
9SHA512 (openjdk7/bootstrap-jdk-1.7.76-netbsd-5-amd64-20150301.tar.xz) = 10b80dd953e68c958732ccb56464ee95d8727a95fd7e930a988355348eb3ee47b27350225b28bcc3ec1480a2297c193675150c70bf2ee1820b118f48cdcf67b2 9SHA512 (openjdk7/bootstrap-jdk-1.7.76-netbsd-5-amd64-20150301.tar.xz) = 10b80dd953e68c958732ccb56464ee95d8727a95fd7e930a988355348eb3ee47b27350225b28bcc3ec1480a2297c193675150c70bf2ee1820b118f48cdcf67b2
10Size (openjdk7/bootstrap-jdk-1.7.76-netbsd-5-amd64-20150301.tar.xz) = 26580632 bytes 10Size (openjdk7/bootstrap-jdk-1.7.76-netbsd-5-amd64-20150301.tar.xz) = 26580632 bytes
11SHA1 (openjdk7/bootstrap-jdk-1.7.76-netbsd-5-i386-20150301.tar.xz) = 2cd7df823723e67531d268286e31168d3eed01a9 11SHA1 (openjdk7/bootstrap-jdk-1.7.76-netbsd-5-i386-20150301.tar.xz) = 2cd7df823723e67531d268286e31168d3eed01a9
12RMD160 (openjdk7/bootstrap-jdk-1.7.76-netbsd-5-i386-20150301.tar.xz) = af4e195a1da1be15df30808fe9b10f684146a3ea 12RMD160 (openjdk7/bootstrap-jdk-1.7.76-netbsd-5-i386-20150301.tar.xz) = af4e195a1da1be15df30808fe9b10f684146a3ea
13SHA512 (openjdk7/bootstrap-jdk-1.7.76-netbsd-5-i386-20150301.tar.xz) = eec0b48e62e29d526911b71079627e3b3a0057e78d1a0195072bac432e4e772f29f9dcc39d6ce972ec56c4b48ec103833779d5b50dae8164303174540f360c1d 13SHA512 (openjdk7/bootstrap-jdk-1.7.76-netbsd-5-i386-20150301.tar.xz) = eec0b48e62e29d526911b71079627e3b3a0057e78d1a0195072bac432e4e772f29f9dcc39d6ce972ec56c4b48ec103833779d5b50dae8164303174540f360c1d
14Size (openjdk7/bootstrap-jdk-1.7.76-netbsd-5-i386-20150301.tar.xz) = 26857692 bytes 14Size (openjdk7/bootstrap-jdk-1.7.76-netbsd-5-i386-20150301.tar.xz) = 26857692 bytes
@@ -95,26 +95,27 @@ SHA1 (patch-hotspot_src_os_solaris_vm_pe @@ -95,26 +95,27 @@ SHA1 (patch-hotspot_src_os_solaris_vm_pe
95SHA1 (patch-hotspot_src_share_vm_oops_klass.hpp) = 2a728aa8fb04976195ebf58549a544b97e56b329 95SHA1 (patch-hotspot_src_share_vm_oops_klass.hpp) = 2a728aa8fb04976195ebf58549a544b97e56b329
96SHA1 (patch-hotspot_src_share_vm_opto_library__call.cpp) = 4654248e3fdf9a1be8ef5563e50b12dcd59aa1aa 96SHA1 (patch-hotspot_src_share_vm_opto_library__call.cpp) = 4654248e3fdf9a1be8ef5563e50b12dcd59aa1aa
97SHA1 (patch-hotspot_src_share_vm_opto_node.cpp) = aacb4e03f62f1a6f9b38de39a966c318b70b1293 97SHA1 (patch-hotspot_src_share_vm_opto_node.cpp) = aacb4e03f62f1a6f9b38de39a966c318b70b1293
98SHA1 (patch-hotspot_src_share_vm_runtime_arguments.cpp) = 80265396c62de95b0937d770c1dba0e8a53daa80 98SHA1 (patch-hotspot_src_share_vm_runtime_arguments.cpp) = 80265396c62de95b0937d770c1dba0e8a53daa80
99SHA1 (patch-hotspot_src_share_vm_utilities_globalDefinitions__gcc.hpp) = f35b8c1a1841f1239aa25d58d0b8749bb7b29ad2 99SHA1 (patch-hotspot_src_share_vm_utilities_globalDefinitions__gcc.hpp) = f35b8c1a1841f1239aa25d58d0b8749bb7b29ad2
100SHA1 (patch-hotspot_src_share_vm_utilities_hashtable.cpp) = 83b90d951ce3aa9e913a36d792ac7376fb3d8bc7 100SHA1 (patch-hotspot_src_share_vm_utilities_hashtable.cpp) = 83b90d951ce3aa9e913a36d792ac7376fb3d8bc7
101SHA1 (patch-hotspot_test_compiler_native_TestDirtyInt.sh) = a24016e3594b49db232388974d40e8f4d411edcd 101SHA1 (patch-hotspot_test_compiler_native_TestDirtyInt.sh) = a24016e3594b49db232388974d40e8f4d411edcd
102SHA1 (patch-jdk_make_CompileDemos.gmk) = 4d5e2e9b0e35e373e6246408c775c25094b6f1c7 102SHA1 (patch-jdk_make_CompileDemos.gmk) = 4d5e2e9b0e35e373e6246408c775c25094b6f1c7
103SHA1 (patch-jdk_make_CompileLaunchers.gmk) = 30a2dc0b7f211c47b1b831691d310865a5839851 103SHA1 (patch-jdk_make_CompileLaunchers.gmk) = 30a2dc0b7f211c47b1b831691d310865a5839851
104SHA1 (patch-jdk_make_CreateJars.gmk) = 0f49c8ec33121d7878ea4b6bd06d2e4e4af9a1d5 104SHA1 (patch-jdk_make_CreateJars.gmk) = 0f49c8ec33121d7878ea4b6bd06d2e4e4af9a1d5
105SHA1 (patch-jdk_make_GenerateSources.gmk) = ec1b64805afb6edca637d87529b1d3fa59d20828 105SHA1 (patch-jdk_make_GenerateSources.gmk) = ec1b64805afb6edca637d87529b1d3fa59d20828
106SHA1 (patch-jdk_make_Images.gmk) = e6643dcb25ad5457efe610f6ab7fd0ccc9b5ed41 106SHA1 (patch-jdk_make_Images.gmk) = e6643dcb25ad5457efe610f6ab7fd0ccc9b5ed41
107SHA1 (patch-jdk_make_lib_Awt2dLibraries.gmk) = ea107ae5e396263489cac9b058bcdd92891baeac 107SHA1 (patch-jdk_make_lib_Awt2dLibraries.gmk) = ea107ae5e396263489cac9b058bcdd92891baeac
 108SHA1 (patch-jdk_make_lib_CoreLibraries.gmk) = 839197feea5ccc9ede70c2c454199fa5ca00c500
108SHA1 (patch-jdk_make_lib_NioLibraries.gmk) = 5a1044c444e534d627b46d820d27bb545e65959d 109SHA1 (patch-jdk_make_lib_NioLibraries.gmk) = 5a1044c444e534d627b46d820d27bb545e65959d
109SHA1 (patch-jdk_make_lib_SoundLibraries.gmk) = b63cf0ebe204acf7264704916df875a31de84393 110SHA1 (patch-jdk_make_lib_SoundLibraries.gmk) = b63cf0ebe204acf7264704916df875a31de84393
110SHA1 (patch-jdk_src_share_lib_security_java.security-bsd) = 5a64fc1205a5bd2f6586ad65ca21f93dfffb1606 111SHA1 (patch-jdk_src_share_lib_security_java.security-bsd) = 5a64fc1205a5bd2f6586ad65ca21f93dfffb1606
111SHA1 (patch-jdk_src_share_native_sun_awt_image_jpeg_imageioJPEG.c) = 9d8900a6f9cc6af99b08e281b0d6d4c337916317 112SHA1 (patch-jdk_src_share_native_sun_awt_image_jpeg_imageioJPEG.c) = 9d8900a6f9cc6af99b08e281b0d6d4c337916317
112SHA1 (patch-jdk_src_share_native_sun_awt_image_jpeg_jpegdecoder.c) = 5986de69be2eb36546274a8242b8d13ed7599b50 113SHA1 (patch-jdk_src_share_native_sun_awt_image_jpeg_jpegdecoder.c) = 5986de69be2eb36546274a8242b8d13ed7599b50
113SHA1 (patch-jdk_src_share_native_sun_security_ec_impl_ecc__impl.h) = 18e79e74dc8ec2b24ab91ad8af2195bfd508d1b4 114SHA1 (patch-jdk_src_share_native_sun_security_ec_impl_ecc__impl.h) = 18e79e74dc8ec2b24ab91ad8af2195bfd508d1b4
114SHA1 (patch-jdk_src_solaris_bin_ergo.c) = 0e2e496a0d596cc9de546c722b3387ad5a08bc21 115SHA1 (patch-jdk_src_solaris_bin_ergo.c) = 0e2e496a0d596cc9de546c722b3387ad5a08bc21
115SHA1 (patch-jdk_src_solaris_bin_ergo__i586.c) = f6fd4c1e0627867ba8d5071da7c53697177805dd 116SHA1 (patch-jdk_src_solaris_bin_ergo__i586.c) = f6fd4c1e0627867ba8d5071da7c53697177805dd
116SHA1 (patch-jdk_src_solaris_classes_sun_net_PortConfig.java) = ea9f74b654ddc7ab977daff6c9176d78657145a9 117SHA1 (patch-jdk_src_solaris_classes_sun_net_PortConfig.java) = ea9f74b654ddc7ab977daff6c9176d78657145a9
117SHA1 (patch-jdk_src_solaris_classes_sun_nio_ch_DefaultAsynchronousChannelProvider.java) = f11483cb75ab5cad5a5b749cab287d5dbaaefe63 118SHA1 (patch-jdk_src_solaris_classes_sun_nio_ch_DefaultAsynchronousChannelProvider.java) = f11483cb75ab5cad5a5b749cab287d5dbaaefe63
118SHA1 (patch-jdk_src_solaris_native_com_sun_media_sound_PLATFORM__API__BsdOS__ALSA__PCM.c) = 7fab23dce20b4ff18123ea65841589ae673f5675 119SHA1 (patch-jdk_src_solaris_native_com_sun_media_sound_PLATFORM__API__BsdOS__ALSA__PCM.c) = 7fab23dce20b4ff18123ea65841589ae673f5675
119SHA1 (patch-jdk_src_solaris_native_java_lang_UNIXProcess__md.c) = 2596d03c4a2e0d978aabfd4b170b0dd1d6260c6d 120SHA1 (patch-jdk_src_solaris_native_java_lang_UNIXProcess__md.c) = 2596d03c4a2e0d978aabfd4b170b0dd1d6260c6d
120SHA1 (patch-jdk_src_solaris_native_java_lang_java__props__md.c) = 672c9a044936cb11cc91e9a3e550dc69ef665209 121SHA1 (patch-jdk_src_solaris_native_java_lang_java__props__md.c) = 672c9a044936cb11cc91e9a3e550dc69ef665209
File Added: pkgsrc/lang/openjdk8/patches/patch-jdk_make_lib_CoreLibraries.gmk
$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