Update openjdk8 to latest version from the bsd-port hg tree. (u45-b13) No full changelog available but at least fixes the security issues noted in the April 2015 Critical Patch Update from Oracle.diff -r1.13 -r1.14 pkgsrc/lang/openjdk8/Makefile
(tnn)
@@ -1,18 +1,17 @@ | @@ -1,18 +1,17 @@ | |||
1 | # $NetBSD: Makefile,v 1.13 2015/05/05 16:20:08 abs Exp $ | 1 | # $NetBSD: Makefile,v 1.14 2015/06/10 11:38:51 tnn Exp $ | |
2 | 2 | |||
3 | DISTNAME= openjdk-1.8.31-20150207 | 3 | DISTNAME= openjdk-1.8.45-20150610 | |
4 | PKGNAME= openjdk8-1.8.31 | 4 | PKGNAME= openjdk8-1.8.45 | |
5 | PKGREVISION= 5 | |||
6 | CATEGORIES= lang | 5 | CATEGORIES= lang | |
7 | MASTER_SITES= ${MASTER_SITE_LOCAL:=openjdk7/} | 6 | MASTER_SITES= ${MASTER_SITE_LOCAL:=openjdk7/} | |
8 | EXTRACT_SUFX= .tar.xz | 7 | EXTRACT_SUFX= .tar.xz | |
9 | 8 | |||
10 | MAINTAINER= pkgsrc-users@NetBSD.org | 9 | MAINTAINER= pkgsrc-users@NetBSD.org | |
11 | HOMEPAGE= http://openjdk.java.net/ | 10 | HOMEPAGE= http://openjdk.java.net/ | |
12 | COMMENT= Open-source implementation of the Java Platform, Standard Edition | 11 | COMMENT= Open-source implementation of the Java Platform, Standard Edition | |
13 | LICENSE= gnu-gpl-v2 | 12 | LICENSE= gnu-gpl-v2 | |
14 | 13 | |||
15 | DISTFILES= ${DEFAULT_DISTFILES} | 14 | DISTFILES= ${DEFAULT_DISTFILES} | |
16 | EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} | 15 | EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} | |
17 | 16 | |||
18 | # Use same DIST_SUBDIR as openjdk7 to avoid duplication of common distfiles | 17 | # Use same DIST_SUBDIR as openjdk7 to avoid duplication of common distfiles |
@@ -1,14 +1,14 @@ | @@ -1,14 +1,14 @@ | |||
1 | $NetBSD: distinfo,v 1.16 2015/03/24 14:24:38 joerg Exp $ | 1 | $NetBSD: distinfo,v 1.17 2015/06/10 11:38:51 tnn Exp $ | |
2 | 2 | |||
3 | SHA1 (openjdk7/bootstrap-jdk-1.7.76-freebsd-10-amd64-20150301.tar.xz) = 7408f52d3bbe35c2b14bbd3215cbf60f1335d334 | 3 | SHA1 (openjdk7/bootstrap-jdk-1.7.76-freebsd-10-amd64-20150301.tar.xz) = 7408f52d3bbe35c2b14bbd3215cbf60f1335d334 | |
4 | RMD160 (openjdk7/bootstrap-jdk-1.7.76-freebsd-10-amd64-20150301.tar.xz) = 24f1577b5fc86d137f070aedb4610c8c89e45815 | 4 | RMD160 (openjdk7/bootstrap-jdk-1.7.76-freebsd-10-amd64-20150301.tar.xz) = 24f1577b5fc86d137f070aedb4610c8c89e45815 | |
5 | Size (openjdk7/bootstrap-jdk-1.7.76-freebsd-10-amd64-20150301.tar.xz) = 26404752 bytes | 5 | Size (openjdk7/bootstrap-jdk-1.7.76-freebsd-10-amd64-20150301.tar.xz) = 26404752 bytes | |
6 | SHA1 (openjdk7/bootstrap-jdk-1.7.76-netbsd-5-amd64-20150301.tar.xz) = 358c533580700065fd5c3c5c99ce3fd087589c00 | 6 | SHA1 (openjdk7/bootstrap-jdk-1.7.76-netbsd-5-amd64-20150301.tar.xz) = 358c533580700065fd5c3c5c99ce3fd087589c00 | |
7 | RMD160 (openjdk7/bootstrap-jdk-1.7.76-netbsd-5-amd64-20150301.tar.xz) = 96e74f40360f0d4c1272bf5f37cf8869b718a5ee | 7 | RMD160 (openjdk7/bootstrap-jdk-1.7.76-netbsd-5-amd64-20150301.tar.xz) = 96e74f40360f0d4c1272bf5f37cf8869b718a5ee | |
8 | Size (openjdk7/bootstrap-jdk-1.7.76-netbsd-5-amd64-20150301.tar.xz) = 26580632 bytes | 8 | Size (openjdk7/bootstrap-jdk-1.7.76-netbsd-5-amd64-20150301.tar.xz) = 26580632 bytes | |
9 | SHA1 (openjdk7/bootstrap-jdk-1.7.76-netbsd-5-i386-20150301.tar.xz) = 2cd7df823723e67531d268286e31168d3eed01a9 | 9 | SHA1 (openjdk7/bootstrap-jdk-1.7.76-netbsd-5-i386-20150301.tar.xz) = 2cd7df823723e67531d268286e31168d3eed01a9 | |
10 | RMD160 (openjdk7/bootstrap-jdk-1.7.76-netbsd-5-i386-20150301.tar.xz) = af4e195a1da1be15df30808fe9b10f684146a3ea | 10 | RMD160 (openjdk7/bootstrap-jdk-1.7.76-netbsd-5-i386-20150301.tar.xz) = af4e195a1da1be15df30808fe9b10f684146a3ea | |
11 | Size (openjdk7/bootstrap-jdk-1.7.76-netbsd-5-i386-20150301.tar.xz) = 26857692 bytes | 11 | Size (openjdk7/bootstrap-jdk-1.7.76-netbsd-5-i386-20150301.tar.xz) = 26857692 bytes | |
12 | SHA1 (openjdk7/bootstrap-jdk-1.7.76-netbsd-6-amd64-20150301.tar.xz) = a1b568394a76bfdd164042ea40e67caa94dd489d | 12 | SHA1 (openjdk7/bootstrap-jdk-1.7.76-netbsd-6-amd64-20150301.tar.xz) = a1b568394a76bfdd164042ea40e67caa94dd489d | |
13 | RMD160 (openjdk7/bootstrap-jdk-1.7.76-netbsd-6-amd64-20150301.tar.xz) = 7f50618a4a14ec218e886e88e76ad682b6b7fb57 | 13 | RMD160 (openjdk7/bootstrap-jdk-1.7.76-netbsd-6-amd64-20150301.tar.xz) = 7f50618a4a14ec218e886e88e76ad682b6b7fb57 | |
14 | Size (openjdk7/bootstrap-jdk-1.7.76-netbsd-6-amd64-20150301.tar.xz) = 26716528 bytes | 14 | Size (openjdk7/bootstrap-jdk-1.7.76-netbsd-6-amd64-20150301.tar.xz) = 26716528 bytes | |
@@ -23,65 +23,61 @@ RMD160 (openjdk7/bootstrap-jdk-1.7.76-ne | @@ -23,65 +23,61 @@ RMD160 (openjdk7/bootstrap-jdk-1.7.76-ne | |||
23 | Size (openjdk7/bootstrap-jdk-1.7.76-netbsd-7-earmv6hf-20150306.tar.xz) = 23104564 bytes | 23 | Size (openjdk7/bootstrap-jdk-1.7.76-netbsd-7-earmv6hf-20150306.tar.xz) = 23104564 bytes | |
24 | SHA1 (openjdk7/bootstrap-jdk-1.7.76-netbsd-7-i386-20150301.tar.xz) = ff3a3e65c8317017b7f83d688a19630f928e86c7 | 24 | SHA1 (openjdk7/bootstrap-jdk-1.7.76-netbsd-7-i386-20150301.tar.xz) = ff3a3e65c8317017b7f83d688a19630f928e86c7 | |
25 | RMD160 (openjdk7/bootstrap-jdk-1.7.76-netbsd-7-i386-20150301.tar.xz) = 627914b2c853da7a2d86e8a8b24fef1e36f25251 | 25 | RMD160 (openjdk7/bootstrap-jdk-1.7.76-netbsd-7-i386-20150301.tar.xz) = 627914b2c853da7a2d86e8a8b24fef1e36f25251 | |
26 | Size (openjdk7/bootstrap-jdk-1.7.76-netbsd-7-i386-20150301.tar.xz) = 27615992 bytes | 26 | Size (openjdk7/bootstrap-jdk-1.7.76-netbsd-7-i386-20150301.tar.xz) = 27615992 bytes | |
27 | SHA1 (openjdk7/bootstrap-jdk-1.7.76-netbsd-7-sparc64-20150301.tar.xz) = 69375362b2638d803c71392008a73f956d315085 | 27 | SHA1 (openjdk7/bootstrap-jdk-1.7.76-netbsd-7-sparc64-20150301.tar.xz) = 69375362b2638d803c71392008a73f956d315085 | |
28 | RMD160 (openjdk7/bootstrap-jdk-1.7.76-netbsd-7-sparc64-20150301.tar.xz) = 06b40db72e7154daff49093f3b6e8aa39cae27b3 | 28 | RMD160 (openjdk7/bootstrap-jdk-1.7.76-netbsd-7-sparc64-20150301.tar.xz) = 06b40db72e7154daff49093f3b6e8aa39cae27b3 | |
29 | Size (openjdk7/bootstrap-jdk-1.7.76-netbsd-7-sparc64-20150301.tar.xz) = 23041084 bytes | 29 | Size (openjdk7/bootstrap-jdk-1.7.76-netbsd-7-sparc64-20150301.tar.xz) = 23041084 bytes | |
30 | SHA1 (openjdk7/bootstrap-jdk7u60-bin-dragonfly-3.6-amd64-20140719.tar.bz2) = 98fdb66b429148ae3922a2f9b2db736a1708e337 | 30 | SHA1 (openjdk7/bootstrap-jdk7u60-bin-dragonfly-3.6-amd64-20140719.tar.bz2) = 98fdb66b429148ae3922a2f9b2db736a1708e337 | |
31 | RMD160 (openjdk7/bootstrap-jdk7u60-bin-dragonfly-3.6-amd64-20140719.tar.bz2) = 4835c6361f66138d73f583c40df0e04a31257157 | 31 | RMD160 (openjdk7/bootstrap-jdk7u60-bin-dragonfly-3.6-amd64-20140719.tar.bz2) = 4835c6361f66138d73f583c40df0e04a31257157 | |
32 | Size (openjdk7/bootstrap-jdk7u60-bin-dragonfly-3.6-amd64-20140719.tar.bz2) = 37910104 bytes | 32 | Size (openjdk7/bootstrap-jdk7u60-bin-dragonfly-3.6-amd64-20140719.tar.bz2) = 37910104 bytes | |
33 | SHA1 (openjdk7/bootstrap-jdk7u60-bin-dragonfly-3.8-amd64-20140719.tar.bz2) = 29bd7aa925941933b2da671340e1d325d9603e5d | 33 | SHA1 (openjdk7/bootstrap-jdk7u60-bin-dragonfly-3.8-amd64-20140719.tar.bz2) = 29bd7aa925941933b2da671340e1d325d9603e5d | |
34 | RMD160 (openjdk7/bootstrap-jdk7u60-bin-dragonfly-3.8-amd64-20140719.tar.bz2) = b13d0e42839fb746d41f9001e488162b47803140 | 34 | RMD160 (openjdk7/bootstrap-jdk7u60-bin-dragonfly-3.8-amd64-20140719.tar.bz2) = b13d0e42839fb746d41f9001e488162b47803140 | |
35 | Size (openjdk7/bootstrap-jdk7u60-bin-dragonfly-3.8-amd64-20140719.tar.bz2) = 37883700 bytes | 35 | Size (openjdk7/bootstrap-jdk7u60-bin-dragonfly-3.8-amd64-20140719.tar.bz2) = 37883700 bytes | |
36 | SHA1 (openjdk7/openjdk-1.8.31-20150207.tar.xz) = f29db4779b126c829d8385208a570c96553b88c8 | 36 | SHA1 (openjdk7/openjdk-1.8.45-20150610.tar.xz) = 8484ef7273b6a1a1e54c060808bf476b53083652 | |
37 | RMD160 (openjdk7/openjdk-1.8.31-20150207.tar.xz) = 09434e80bac77f6d367dbe0fe5ee051f1f12c7fe | 37 | RMD160 (openjdk7/openjdk-1.8.45-20150610.tar.xz) = 272f554ed8af27d6473786515794553217854bb6 | |
38 | Size (openjdk7/openjdk-1.8.31-20150207.tar.xz) = 51853460 bytes | 38 | Size (openjdk7/openjdk-1.8.45-20150610.tar.xz) = 52304136 bytes | |
39 | SHA1 (patch-aa) = 8b8d8bb80bba647eaed242f0f90b98c5001d8164 | 39 | SHA1 (patch-aa) = fd07ea984cb0127b56a9b591c21c8d4f236fd9fc | |
40 | SHA1 (patch-al) = f65f739805c2ef471a4de10d6da42e86c5561b8c | 40 | SHA1 (patch-al) = f65f739805c2ef471a4de10d6da42e86c5561b8c | |
41 | SHA1 (patch-an) = fce4da00762770c1c0592bd225bf73e875252178 | 41 | SHA1 (patch-an) = fce4da00762770c1c0592bd225bf73e875252178 | |
42 | SHA1 (patch-ap) = 89114a9ee048b92d897509feb283cf9aeeac9fc5 | 42 | SHA1 (patch-ap) = 89114a9ee048b92d897509feb283cf9aeeac9fc5 | |
43 | SHA1 (patch-as) = 484ba6dd99c650ebe3df5639548ee2874c326aaa | 43 | SHA1 (patch-as) = 484ba6dd99c650ebe3df5639548ee2874c326aaa | |
44 | SHA1 (patch-at) = 736ead4b9f391c711bf1f387d87ffb9363823557 | 44 | SHA1 (patch-at) = 736ead4b9f391c711bf1f387d87ffb9363823557 | |
45 | SHA1 (patch-ba) = a54a25d4f8982ff4d2cb4e7e456fe2a44656b800 | 45 | SHA1 (patch-ba) = a54a25d4f8982ff4d2cb4e7e456fe2a44656b800 | |
46 | SHA1 (patch-bh) = 6194a7c319a496f8ff7df173912cf87118f26a63 | 46 | SHA1 (patch-bh) = 6194a7c319a496f8ff7df173912cf87118f26a63 | |
47 | SHA1 (patch-bi) = 190056b3d4c42986ae0a600668b02711598361b8 | 47 | SHA1 (patch-bi) = 190056b3d4c42986ae0a600668b02711598361b8 | |
48 | SHA1 (patch-bn) = a50dbe17236a90d60d4bbb852ae447e51a279892 | 48 | SHA1 (patch-bn) = a50dbe17236a90d60d4bbb852ae447e51a279892 | |
49 | SHA1 (patch-common_autoconf_generated-configure.sh) = abfec0410c3d239a42e44d7f2619cceb02622769 | 49 | SHA1 (patch-common_autoconf_generated-configure.sh) = f754ad280fc9bb235ddf515d84ddb4db0e0bf096 | |
50 | SHA1 (patch-common_autoconf_spec.gmk.in) = e39f543e7e16bd63ee33696192221a99c7e06505 | 50 | SHA1 (patch-common_autoconf_spec.gmk.in) = e39f543e7e16bd63ee33696192221a99c7e06505 | |
51 | SHA1 (patch-hotspot_agent_src_share_classes_sun_jvm_hotspot_utilities_PlatformInfo.java) = 893f3b7ad0839a75be49ddd0f5eefcff2dbd2928 | 51 | SHA1 (patch-hotspot_agent_src_share_classes_sun_jvm_hotspot_utilities_PlatformInfo.java) = 893f3b7ad0839a75be49ddd0f5eefcff2dbd2928 | |
52 | SHA1 (patch-hotspot_make_bsd_makefiles_defs.make) = 6b3e2f769c754b3ee5de8c07444964414136fa81 | 52 | SHA1 (patch-hotspot_make_bsd_makefiles_defs.make) = 6b3e2f769c754b3ee5de8c07444964414136fa81 | |
53 | SHA1 (patch-hotspot_src_cpu_zero_vm_methodHandles__zero.cpp) = 9f7acf1eff3baba430880be9fd0f6148056dd088 | 53 | SHA1 (patch-hotspot_src_cpu_zero_vm_methodHandles__zero.cpp) = 9f7acf1eff3baba430880be9fd0f6148056dd088 | |
54 | SHA1 (patch-hotspot_src_cpu_zero_vm_nativeInst__zero.cpp) = dcd83b65a7d74e153a3e1c44f8c7980827ec20c7 | 54 | SHA1 (patch-hotspot_src_cpu_zero_vm_nativeInst__zero.cpp) = dcd83b65a7d74e153a3e1c44f8c7980827ec20c7 | |
55 | SHA1 (patch-hotspot_src_os__cpu_bsd__zero_vm_atomic__bsd__zero.inline.hpp) = e87224f8b67dc78fa411d30beff82ce5ccbb4cc5 | 55 | SHA1 (patch-hotspot_src_os__cpu_bsd__zero_vm_atomic__bsd__zero.inline.hpp) = e87224f8b67dc78fa411d30beff82ce5ccbb4cc5 | |
56 | SHA1 (patch-hotspot_src_os__cpu_bsd__zero_vm_orderAccess__bsd__zero.inline.hpp) = 6311d68db9064afc470f1d9fd37e63011899659a | 56 | SHA1 (patch-hotspot_src_os__cpu_bsd__zero_vm_orderAccess__bsd__zero.inline.hpp) = 6311d68db9064afc470f1d9fd37e63011899659a | |
57 | SHA1 (patch-hotspot_src_os__cpu_bsd__zero_vm_os__bsd__zero.cpp) = 4fa018be66fad39aa0a922dfb86c79661a7379f2 | 57 | SHA1 (patch-hotspot_src_os__cpu_bsd__zero_vm_os__bsd__zero.cpp) = 4fa018be66fad39aa0a922dfb86c79661a7379f2 | |
58 | SHA1 (patch-hotspot_src_os_bsd_vm_osThread__bsd.cpp) = c34887b4bf0873c70a44adaaa9be38614603e1d4 | 58 | SHA1 (patch-hotspot_src_os_posix_vm_os__posix.cpp) = 69a4ff639488bec525cb5bbccaca10dae0d7dc4d | |
59 | SHA1 (patch-hotspot_src_os_posix_vm_os__posix.cpp) = f38d3ea8002bc8c58d1cf05e70424858dabd2991 | |||
60 | SHA1 (patch-hotspot_src_share_vm_opto_node.cpp) = aacb4e03f62f1a6f9b38de39a966c318b70b1293 | 59 | SHA1 (patch-hotspot_src_share_vm_opto_node.cpp) = aacb4e03f62f1a6f9b38de39a966c318b70b1293 | |
61 | SHA1 (patch-hotspot_src_share_vm_utilities_globalDefinitions__gcc.hpp) = cab48bc272fc67f3326e663dc6feb94fe56ec79f | 60 | SHA1 (patch-hotspot_src_share_vm_utilities_globalDefinitions__gcc.hpp) = cab48bc272fc67f3326e663dc6feb94fe56ec79f | |
62 | SHA1 (patch-jdk_make_CompileLaunchers.gmk) = 76bae0aab5528a6c020d2fdd5ba7c1ffa132aca2 | 61 | SHA1 (patch-jdk_make_CompileLaunchers.gmk) = 76bae0aab5528a6c020d2fdd5ba7c1ffa132aca2 | |
63 | SHA1 (patch-jdk_make_CreateJars.gmk) = 0f49c8ec33121d7878ea4b6bd06d2e4e4af9a1d5 | 62 | SHA1 (patch-jdk_make_CreateJars.gmk) = 0f49c8ec33121d7878ea4b6bd06d2e4e4af9a1d5 | |
64 | SHA1 (patch-jdk_make_GenerateSources.gmk) = ec1b64805afb6edca637d87529b1d3fa59d20828 | 63 | SHA1 (patch-jdk_make_GenerateSources.gmk) = ec1b64805afb6edca637d87529b1d3fa59d20828 | |
65 | SHA1 (patch-jdk_make_Images.gmk) = 7f3374554fa889ca2820f91f9dc1d34f2f39df0b | 64 | SHA1 (patch-jdk_make_Images.gmk) = 7f3374554fa889ca2820f91f9dc1d34f2f39df0b | |
66 | SHA1 (patch-jdk_make_lib_NioLibraries.gmk) = 2498a90e948d9c9329230ab22ac447f06d2f2741 | 65 | SHA1 (patch-jdk_make_lib_SoundLibraries.gmk) = 1da8abd48754289f24aaeb610f05e58ad829123b | |
67 | SHA1 (patch-jdk_make_lib_SoundLibraries.gmk) = 27c33019f28d38efc0ae2c019b3e6e44863e8253 | |||
68 | SHA1 (patch-jdk_src_share_native_sun_awt_image_jpeg_imageioJPEG.c) = fe58fe992521c0ef8b7b60f8213bfcd714790c1e | 66 | SHA1 (patch-jdk_src_share_native_sun_awt_image_jpeg_imageioJPEG.c) = fe58fe992521c0ef8b7b60f8213bfcd714790c1e | |
69 | SHA1 (patch-jdk_src_share_native_sun_awt_image_jpeg_jpegdecoder.c) = 08270f0a9e0eacf6416a09e300429ccdc1bcdad8 | 67 | SHA1 (patch-jdk_src_share_native_sun_awt_image_jpeg_jpegdecoder.c) = 5986de69be2eb36546274a8242b8d13ed7599b50 | |
70 | SHA1 (patch-jdk_src_solaris_bin_ergo.c) = 0e2e496a0d596cc9de546c722b3387ad5a08bc21 | 68 | SHA1 (patch-jdk_src_solaris_bin_ergo.c) = 0e2e496a0d596cc9de546c722b3387ad5a08bc21 | |
71 | SHA1 (patch-jdk_src_solaris_classes_java_lang_UNIXProcess.java.bsd) = 6037c862d219a73617f0d04e844c109f03466691 | |||
72 | SHA1 (patch-jdk_src_solaris_classes_sun_net_PortConfig.java) = ea9f74b654ddc7ab977daff6c9176d78657145a9 | 69 | SHA1 (patch-jdk_src_solaris_classes_sun_net_PortConfig.java) = ea9f74b654ddc7ab977daff6c9176d78657145a9 | |
73 | SHA1 (patch-jdk_src_solaris_classes_sun_nio_ch_DefaultAsynchronousChannelProvider.java) = f11483cb75ab5cad5a5b749cab287d5dbaaefe63 | 70 | SHA1 (patch-jdk_src_solaris_classes_sun_nio_ch_DefaultAsynchronousChannelProvider.java) = f11483cb75ab5cad5a5b749cab287d5dbaaefe63 | |
74 | SHA1 (patch-jdk_src_solaris_native_com_sun_media_sound_PLATFORM__API__BsdOS__ALSA__PCM.c) = 7fab23dce20b4ff18123ea65841589ae673f5675 | 71 | SHA1 (patch-jdk_src_solaris_native_com_sun_media_sound_PLATFORM__API__BsdOS__ALSA__PCM.c) = 7fab23dce20b4ff18123ea65841589ae673f5675 | |
75 | SHA1 (patch-jdk_src_solaris_native_java_lang_UNIXProcess__md.c) = 2596d03c4a2e0d978aabfd4b170b0dd1d6260c6d | 72 | SHA1 (patch-jdk_src_solaris_native_java_lang_UNIXProcess__md.c) = 2596d03c4a2e0d978aabfd4b170b0dd1d6260c6d | |
76 | SHA1 (patch-jdk_src_solaris_native_java_lang_java__props__md.c) = 6c6648c2716508209f07512327afe3ec1179f64c | 73 | SHA1 (patch-jdk_src_solaris_native_java_lang_java__props__md.c) = 6c6648c2716508209f07512327afe3ec1179f64c | |
77 | SHA1 (patch-jdk_src_solaris_native_java_net_NetworkInterface.c) = ea06dc34b1c6dc08b7d1537ae129a3a2e3636f81 | 74 | SHA1 (patch-jdk_src_solaris_native_java_net_NetworkInterface.c) = 3409e21ec151e407053fd510760c8b082f1beda5 | |
78 | SHA1 (patch-jdk_src_solaris_native_java_net_net__util__md.c) = c404a3520f82b8cc5eb906725aa2bc7f27cad801 | 75 | SHA1 (patch-jdk_src_solaris_native_java_net_net__util__md.c) = c404a3520f82b8cc5eb906725aa2bc7f27cad801 | |
79 | SHA1 (patch-jdk_src_solaris_native_sun_awt_X11Color.c) = cf0f8218e0088b677cd66fd5bc0d575ab08b710f | 76 | SHA1 (patch-jdk_src_solaris_native_sun_awt_X11Color.c) = cf0f8218e0088b677cd66fd5bc0d575ab08b710f | |
80 | SHA1 (patch-jdk_src_solaris_native_sun_security_pkcs11_j2secmod_md.c) = 6eb1f6b3cd62cb35a7b72cae7cb25bc5dc45fd9b | |||
81 | SHA1 (patch-jdk_test_Makefile) = 36430647c444dea491ae0c916c6ad7b1a3607ec6 | 77 | SHA1 (patch-jdk_test_Makefile) = 36430647c444dea491ae0c916c6ad7b1a3607ec6 | |
82 | SHA1 (patch-jdk_test_java_beans_Introspector_4168475_Test4168475.java) = 5fb2dd92820afcca5a04956d81e5244840b513f7 | 78 | SHA1 (patch-jdk_test_java_beans_Introspector_4168475_Test4168475.java) = 5fb2dd92820afcca5a04956d81e5244840b513f7 | |
83 | SHA1 (patch-jdk_test_java_beans_Introspector_4520754_Test4520754.java) = e5d6121d2af74238347baa2d63670f0d520847f8 | 79 | SHA1 (patch-jdk_test_java_beans_Introspector_4520754_Test4520754.java) = e5d6121d2af74238347baa2d63670f0d520847f8 | |
84 | SHA1 (patch-jdk_test_java_beans_Introspector_Test4144543.java) = bb0a20f688093f2d60f4a4937ae418fcebfcc7ca | 80 | SHA1 (patch-jdk_test_java_beans_Introspector_Test4144543.java) = bb0a20f688093f2d60f4a4937ae418fcebfcc7ca | |
85 | SHA1 (patch-jdk_test_java_lang_management_OperatingSystemMXBean_GetSystemLoadAverage.java) = 07b071ace2a91acd1968ed670aead67d72f0d490 | 81 | SHA1 (patch-jdk_test_java_lang_management_OperatingSystemMXBean_GetSystemLoadAverage.java) = 07b071ace2a91acd1968ed670aead67d72f0d490 | |
86 | SHA1 (patch-jdk_test_sun_security_ec_TestEC.java) = c2db0716408ae1d081b3516b6c866b8f43cf5b6f | 82 | SHA1 (patch-jdk_test_sun_security_ec_TestEC.java) = c2db0716408ae1d081b3516b6c866b8f43cf5b6f | |
87 | SHA1 (patch-langtools_make_build.xml) = e9dccdb67a0f25b266755f66e520c6420afaf7ba | 83 | SHA1 (patch-langtools_make_build.xml) = e9dccdb67a0f25b266755f66e520c6420afaf7ba |
@@ -1,111 +1,90 @@ | @@ -1,111 +1,90 @@ | |||
1 | $NetBSD: patch-aa,v 1.3 2015/03/02 04:26:40 tnn Exp $ | 1 | $NetBSD: patch-aa,v 1.4 2015/06/10 11:38:51 tnn Exp $ | |
2 | 2 | |||
3 | DragonFly support. | 3 | DragonFly support. | |
4 | Add workaround for missing sem_timedwait() in NetBSD < 6.99.4 | 4 | Add workaround for missing sem_timedwait() in NetBSD < 6.99.4 | |
5 | 5 | |||
6 | --- hotspot/src/os/bsd/vm/os_bsd.cpp.orig 2015-02-02 15:32:37.000000000 +0000 | 6 | --- hotspot/src/os/bsd/vm/os_bsd.cpp.orig 2015-06-09 13:49:54.000000000 +0000 | |
7 | +++ hotspot/src/os/bsd/vm/os_bsd.cpp | 7 | +++ hotspot/src/os/bsd/vm/os_bsd.cpp | |
8 | @@ -112,8 +112,11 @@ | 8 | @@ -113,8 +113,11 @@ | |
9 | # include <vm/vm_param.h> | 9 | # include <vm/vm_param.h> | |
10 | #endif | 10 | #endif | |
11 | 11 | |||
12 | -#if defined(__FreeBSD__) || defined(__NetBSD__) | 12 | -#if defined(__FreeBSD__) || defined(__NetBSD__) | |
13 | +#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__) | 13 | +#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__) | |
14 | # include <elf.h> | 14 | # include <elf.h> | |
15 | +#if !defined(EM_ALPHA) | 15 | +#if !defined(EM_ALPHA) | |
16 | +#define EM_ALPHA 0x9026 | 16 | +#define EM_ALPHA 0x9026 | |
17 | +#endif | 17 | +#endif | |
18 | #endif | 18 | #endif | |
19 | 19 | |||
20 | #ifdef __APPLE__ | 20 | #ifdef __NetBSD__ | |
21 | @@ -282,6 +285,7 @@ void os::Bsd::initialize_system_info() { | 21 | @@ -287,6 +290,7 @@ void os::Bsd::initialize_system_info() { | |
22 | size_t len; | 22 | size_t len; | |
23 | int cpu_val; | 23 | int cpu_val; | |
24 | julong mem_val; | 24 | julong mem_val; | |
25 | + struct rlimit limits; | 25 | + struct rlimit limits; | |
26 | 26 | |||
27 | /* get processors count via hw.ncpus sysctl */ | 27 | /* get processors count via hw.ncpus sysctl */ | |
28 | mib[0] = CTL_HW; | 28 | mib[0] = CTL_HW; | |
29 | @@ -302,6 +306,8 @@ void os::Bsd::initialize_system_info() { | 29 | @@ -307,6 +311,8 @@ void os::Bsd::initialize_system_info() { | |
30 | 30 | |||
31 | #if defined (HW_MEMSIZE) // Apple | 31 | #if defined (HW_MEMSIZE) // Apple | |
32 | mib[1] = HW_MEMSIZE; | 32 | mib[1] = HW_MEMSIZE; | |
33 | +#elif defined(HW_PHYSMEM64) // NetBSD | 33 | +#elif defined(HW_PHYSMEM64) // NetBSD | |
34 | + mib[1] = HW_PHYSMEM64; | 34 | + mib[1] = HW_PHYSMEM64; | |
35 | #elif defined(HW_PHYSMEM) // Most of BSD | 35 | #elif defined(HW_PHYSMEM) // Most of BSD | |
36 | mib[1] = HW_PHYSMEM; | 36 | mib[1] = HW_PHYSMEM; | |
37 | #elif defined(HW_REALMEM) // Old FreeBSD | 37 | #elif defined(HW_REALMEM) // Old FreeBSD | |
38 | @@ -318,14 +324,11 @@ void os::Bsd::initialize_system_info() { | 38 | @@ -323,14 +329,11 @@ void os::Bsd::initialize_system_info() { | |
39 | _physical_memory = 256*1024*1024; // fallback (XXXBSD?) | 39 | _physical_memory = 256*1024*1024; // fallback (XXXBSD?) | |
40 | } | 40 | } | |
41 | 41 | |||
42 | -#ifdef __OpenBSD__ | 42 | -#ifdef __OpenBSD__ | |
43 | - { | 43 | - { | |
44 | - // limit _physical_memory memory view on OpenBSD since | 44 | - // limit _physical_memory memory view on OpenBSD since | |
45 | - // datasize rlimit restricts us anyway. | 45 | - // datasize rlimit restricts us anyway. | |
46 | - struct rlimit limits; | 46 | - struct rlimit limits; | |
47 | - getrlimit(RLIMIT_DATA, &limits); | 47 | - getrlimit(RLIMIT_DATA, &limits); | |
48 | - _physical_memory = MIN2(_physical_memory, (julong)limits.rlim_cur); | 48 | - _physical_memory = MIN2(_physical_memory, (julong)limits.rlim_cur); | |
49 | - } | 49 | - } | |
50 | + getrlimit(RLIMIT_DATA, &limits); | 50 | + getrlimit(RLIMIT_DATA, &limits); | |
51 | + _physical_memory = MIN2(_physical_memory, (julong)limits.rlim_cur); | 51 | + _physical_memory = MIN2(_physical_memory, (julong)limits.rlim_cur); | |
52 | +#if defined(RLIMIT_AS) | 52 | +#if defined(RLIMIT_AS) | |
53 | + getrlimit(RLIMIT_AS, &limits); | 53 | + getrlimit(RLIMIT_AS, &limits); | |
54 | + _physical_memory = MIN2(_physical_memory, (julong)limits.rlim_cur); | 54 | + _physical_memory = MIN2(_physical_memory, (julong)limits.rlim_cur); | |
55 | #endif | 55 | #endif | |
56 | } | 56 | } | |
57 | 57 | |||
58 | @@ -377,7 +380,7 @@ void os::init_system_properties_values() | 58 | @@ -382,7 +385,7 @@ void os::init_system_properties_values() | |
59 | // ... | 59 | // ... | |
60 | // 7: The default directories, normally /lib and /usr/lib. | 60 | // 7: The default directories, normally /lib and /usr/lib. | |
61 | #ifndef DEFAULT_LIBPATH | 61 | #ifndef DEFAULT_LIBPATH | |
62 | -#define DEFAULT_LIBPATH "/lib:/usr/lib" | 62 | -#define DEFAULT_LIBPATH "/lib:/usr/lib" | |
63 | +#define DEFAULT_LIBPATH "@PREFIX@/lib/jni:@PREFIX@/lib:/lib:/usr/lib" | 63 | +#define DEFAULT_LIBPATH "@PREFIX@/lib/jni:@PREFIX@/lib:/lib:/usr/lib" | |
64 | #endif | 64 | #endif | |
65 | 65 | |||
66 | // Base path of extensions installed on the system. | 66 | // Base path of extensions installed on the system. | |
67 | @@ -1236,7 +1239,7 @@ pid_t os::Bsd::gettid() { | 67 | @@ -1566,7 +1569,9 @@ void * os::dll_load(const char *filename | |
68 | guarantee(retval != 0, "just checking"); | |||
69 | return retval; | |||
70 | ||||
71 | -#elif __FreeBSD__ | |||
72 | +#elif defined(__FreeBSD__) | |||
73 | #if __FreeBSD_version > 900030 | |||
74 | return ::pthread_getthreadid_np(); | |||
75 | #else | |||
76 | @@ -1244,9 +1247,9 @@ pid_t os::Bsd::gettid() { | |||
77 | thr_self(&tid); | |||
78 | return (pid_t)tid; | |||
79 | #endif | |||
80 | -#elif __OpenBSD__ | |||
81 | +#elif defined(__OpenBSD__) | |||
82 | retval = syscall(SYS_getthrid); | |||
83 | -#elif __NetBSD__ | |||
84 | +#elif defined(__NetBSD__) | |||
85 | retval = (pid_t) syscall(SYS__lwp_self); | |||
86 | #endif | |||
87 | ||||
88 | @@ -1561,7 +1564,9 @@ void * os::dll_load(const char *filename | |||
89 | {EM_PPC, EM_PPC, ELFCLASS32, ELFDATA2MSB, (char*)"Power PC 32"}, | 68 | {EM_PPC, EM_PPC, ELFCLASS32, ELFDATA2MSB, (char*)"Power PC 32"}, | |
90 | {EM_PPC64, EM_PPC64, ELFCLASS64, ELFDATA2MSB, (char*)"Power PC 64"}, | 69 | {EM_PPC64, EM_PPC64, ELFCLASS64, ELFDATA2MSB, (char*)"Power PC 64"}, | |
91 | {EM_ARM, EM_ARM, ELFCLASS32, ELFDATA2LSB, (char*)"ARM"}, | 70 | {EM_ARM, EM_ARM, ELFCLASS32, ELFDATA2LSB, (char*)"ARM"}, | |
92 | +#if 0 | 71 | +#if 0 | |
93 | {EM_S390, EM_S390, ELFCLASSNONE, ELFDATA2MSB, (char*)"IBM System/390"}, | 72 | {EM_S390, EM_S390, ELFCLASSNONE, ELFDATA2MSB, (char*)"IBM System/390"}, | |
94 | +#endif | 73 | +#endif | |
95 | {EM_ALPHA, EM_ALPHA, ELFCLASS64, ELFDATA2LSB, (char*)"Alpha"}, | 74 | {EM_ALPHA, EM_ALPHA, ELFCLASS64, ELFDATA2LSB, (char*)"Alpha"}, | |
96 | {EM_MIPS_RS3_LE, EM_MIPS_RS3_LE, ELFCLASS32, ELFDATA2LSB, (char*)"MIPSel"}, | 75 | {EM_MIPS_RS3_LE, EM_MIPS_RS3_LE, ELFCLASS32, ELFDATA2LSB, (char*)"MIPSel"}, | |
97 | {EM_MIPS, EM_MIPS, ELFCLASS32, ELFDATA2MSB, (char*)"MIPS"}, | 76 | {EM_MIPS, EM_MIPS, ELFCLASS32, ELFDATA2MSB, (char*)"MIPS"}, | |
98 | @@ -2092,6 +2097,33 @@ bool Semaphore::timedwait(unsigned int s | 77 | @@ -2097,6 +2102,33 @@ bool Semaphore::timedwait(unsigned int s | |
99 | 78 | |||
100 | #else | 79 | #else | |
101 | 80 | |||
102 | +#if defined(__NetBSD__) && (__NetBSD_Version__ < 699000400) | 81 | +#if defined(__NetBSD__) && (__NetBSD_Version__ < 699000400) | |
103 | +static inline int sem_timedwait(sem_t *sem, struct timespec *ts) { | 82 | +static inline int sem_timedwait(sem_t *sem, struct timespec *ts) { | |
104 | + struct timespec onems = { 0, 1000000 }; | 83 | + struct timespec onems = { 0, 1000000 }; | |
105 | + struct timespec total = { 0, 0 }; | 84 | + struct timespec total = { 0, 0 }; | |
106 | + struct timespec unslept; | 85 | + struct timespec unslept; | |
107 | + struct timespec elapsed; | 86 | + struct timespec elapsed; | |
108 | + struct timespec tmp; | 87 | + struct timespec tmp; | |
109 | + | 88 | + | |
110 | + while (timespeccmp(ts, &total, >)) { | 89 | + while (timespeccmp(ts, &total, >)) { | |
111 | + if (sem_trywait(sem) == 0) | 90 | + if (sem_trywait(sem) == 0) | |
@@ -119,40 +98,40 @@ Add workaround for missing sem_timedwai | @@ -119,40 +98,40 @@ Add workaround for missing sem_timedwai | |||
119 | + timespecsub(&onems, &unslept, &elapsed); | 98 | + timespecsub(&onems, &unslept, &elapsed); | |
120 | + timespecadd(&total, &elapsed, &tmp); | 99 | + timespecadd(&total, &elapsed, &tmp); | |
121 | + total.tv_sec = tmp.tv_sec; | 100 | + total.tv_sec = tmp.tv_sec; | |
122 | + total.tv_nsec = tmp.tv_nsec; | 101 | + total.tv_nsec = tmp.tv_nsec; | |
123 | + } | 102 | + } | |
124 | + errno = ETIMEDOUT; | 103 | + errno = ETIMEDOUT; | |
125 | + return -1; | 104 | + return -1; | |
126 | +} | 105 | +} | |
127 | +#endif /* __NetBSD__ */ | 106 | +#endif /* __NetBSD__ */ | |
128 | + | 107 | + | |
129 | bool Semaphore::trywait() { | 108 | bool Semaphore::trywait() { | |
130 | return sem_trywait(&_semaphore) == 0; | 109 | return sem_trywait(&_semaphore) == 0; | |
131 | } | 110 | } | |
132 | @@ -2242,7 +2274,7 @@ static void warn_fail_commit_memory(char | 111 | @@ -2247,7 +2279,7 @@ static void warn_fail_commit_memory(char | |
133 | // problem. | 112 | // problem. | |
134 | bool os::pd_commit_memory(char* addr, size_t size, bool exec) { | 113 | bool os::pd_commit_memory(char* addr, size_t size, bool exec) { | |
135 | int prot = exec ? PROT_READ|PROT_WRITE|PROT_EXEC : PROT_READ|PROT_WRITE; | 114 | int prot = exec ? PROT_READ|PROT_WRITE|PROT_EXEC : PROT_READ|PROT_WRITE; | |
136 | -#ifdef __OpenBSD__ | 115 | -#ifdef __OpenBSD__ | |
137 | +#if defined(__OpenBSD__) || defined(__NetBSD__) | 116 | +#if defined(__OpenBSD__) || defined(__NetBSD__) | |
138 | // XXX: Work-around mmap/MAP_FIXED bug temporarily on OpenBSD | 117 | // XXX: Work-around mmap/MAP_FIXED bug temporarily on OpenBSD | |
139 | if (::mprotect(addr, size, prot) == 0) { | 118 | if (::mprotect(addr, size, prot) == 0) { | |
140 | return true; | 119 | return true; | |
141 | @@ -2843,7 +2875,7 @@ OSReturn os::set_native_priority(Thread* | 120 | @@ -2850,7 +2882,7 @@ OSReturn os::set_native_priority(Thread* | |
142 | #ifdef __OpenBSD__ | 121 | #ifdef __OpenBSD__ | |
143 | // OpenBSD pthread_setprio starves low priority threads | 122 | // OpenBSD pthread_setprio starves low priority threads | |
144 | return OS_OK; | 123 | return OS_OK; | |
145 | -#elif defined(__FreeBSD__) | 124 | -#elif defined(__FreeBSD__) | |
146 | +#elif defined(__FreeBSD__) || defined(__DragonFly__) | 125 | +#elif defined(__FreeBSD__) || defined(__DragonFly__) | |
147 | int ret = pthread_setprio(thread->osthread()->pthread_id(), newpri); | 126 | int ret = pthread_setprio(thread->osthread()->pthread_id(), newpri); | |
148 | return (ret == 0) ? OS_OK : OS_ERR; | 127 | return (ret == 0) ? OS_OK : OS_ERR; | |
149 | #elif defined(__APPLE__) || defined(__NetBSD__) | 128 | #elif defined(__APPLE__) || defined(__NetBSD__) | |
150 | @@ -2872,7 +2904,7 @@ OSReturn os::get_native_priority(const T | 129 | @@ -2879,7 +2911,7 @@ OSReturn os::get_native_priority(const T | |
151 | } | 130 | } | |
152 | 131 | |||
153 | errno = 0; | 132 | errno = 0; | |
154 | -#if defined(__OpenBSD__) || defined(__FreeBSD__) | 133 | -#if defined(__OpenBSD__) || defined(__FreeBSD__) | |
155 | +#if defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__DragonFly__) | 134 | +#if defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__DragonFly__) | |
156 | *priority_ptr = pthread_getprio(thread->osthread()->pthread_id()); | 135 | *priority_ptr = pthread_getprio(thread->osthread()->pthread_id()); | |
157 | #elif defined(__APPLE__) || defined(__NetBSD__) | 136 | #elif defined(__APPLE__) || defined(__NetBSD__) | |
158 | int policy; | 137 | int policy; |
@@ -1,129 +1,130 @@ | @@ -1,129 +1,130 @@ | |||
1 | $NetBSD: patch-common_autoconf_generated-configure.sh,v 1.3 2015/02/12 06:20:00 tnn Exp $ | 1 | $NetBSD: patch-common_autoconf_generated-configure.sh,v 1.4 2015/06/10 11:38:51 tnn Exp $ | |
2 | 2 | |||
3 | --- common/autoconf/generated-configure.sh.orig 2015-02-02 15:31:06.000000000 +0000 | 3 | --- common/autoconf/generated-configure.sh.orig 2015-06-09 13:44:54.000000000 +0000 | |
4 | +++ common/autoconf/generated-configure.sh | 4 | +++ common/autoconf/generated-configure.sh | |
5 | @@ -6859,7 +6859,7 @@ test -n "$target_alias" && | 5 | @@ -6883,7 +6883,7 @@ test -n "$target_alias" && | |
6 | VAR_CPU_BITS=32 | 6 | VAR_CPU_BITS=32 | |
7 | VAR_CPU_ENDIAN=big | 7 | VAR_CPU_ENDIAN=big | |
8 | ;; | 8 | ;; | |
9 | - sparcv9) | 9 | - sparcv9) | |
10 | + sparcv9|sparc64) | 10 | + sparcv9|sparc64) | |
11 | VAR_CPU=sparcv9 | 11 | VAR_CPU=sparcv9 | |
12 | VAR_CPU_ARCH=sparc | 12 | VAR_CPU_ARCH=sparc | |
13 | VAR_CPU_BITS=64 | 13 | VAR_CPU_BITS=64 | |
14 | @@ -6990,7 +6990,7 @@ $as_echo "$OPENJDK_BUILD_OS-$OPENJDK_BUI | 14 | @@ -7030,7 +7030,7 @@ $as_echo "$OPENJDK_BUILD_OS-$OPENJDK_BUI | |
15 | VAR_CPU_BITS=32 | 15 | VAR_CPU_BITS=32 | |
16 | VAR_CPU_ENDIAN=big | 16 | VAR_CPU_ENDIAN=big | |
17 | ;; | 17 | ;; | |
18 | - sparcv9) | 18 | - sparcv9) | |
19 | + sparcv9|sparc64) | 19 | + sparcv9|sparc64) | |
20 | VAR_CPU=sparcv9 | 20 | VAR_CPU=sparcv9 | |
21 | VAR_CPU_ARCH=sparc | 21 | VAR_CPU_ARCH=sparc | |
22 | VAR_CPU_BITS=64 | 22 | VAR_CPU_BITS=64 | |
23 | @@ -8379,9 +8379,9 @@ done | 23 | @@ -8421,9 +8421,9 @@ done | |
24 | # We need to find a recent version of GNU make. Especially on Solaris, this can be tricky. | 24 | # We need to find a recent version of GNU make. Especially on Solaris, this can be tricky. | |
25 | if test "x$MAKE" != x; then | 25 | if test "x$MAKE" != x; then | |
26 | # User has supplied a make, test it. | 26 | # User has supplied a make, test it. | |
27 | - if test ! -f "$MAKE"; then | 27 | - if test ! -f "$MAKE"; then | |
28 | - as_fn_error $? "The specified make (by MAKE=$MAKE) is not found." "$LINENO" 5 | 28 | - as_fn_error $? "The specified make (by MAKE=$MAKE) is not found." "$LINENO" 5 | |
29 | - fi | 29 | - fi | |
30 | +# if test ! -f "$MAKE"; then | 30 | +# if test ! -f "$MAKE"; then | |
31 | +# as_fn_error $? "The specified make (by MAKE=$MAKE) is not found." "$LINENO" 5 | 31 | +# as_fn_error $? "The specified make (by MAKE=$MAKE) is not found." "$LINENO" 5 | |
32 | +# fi | 32 | +# fi | |
33 | 33 | |||
34 | MAKE_CANDIDATE=""$MAKE"" | 34 | MAKE_CANDIDATE=""$MAKE"" | |
35 | DESCRIPTION="user supplied MAKE=$MAKE" | 35 | DESCRIPTION="user supplied MAKE=$MAKE" | |
36 | @@ -12483,7 +12483,7 @@ fi | 36 | @@ -12543,7 +12543,7 @@ fi | |
37 | # Resolve file symlinks | 37 | # Resolve file symlinks | |
38 | while test $COUNTER -lt 20; do | 38 | while test $COUNTER -lt 20; do | |
39 | ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'` | 39 | ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'` | |
40 | - if test "x$ISLINK" == x; then | 40 | - if test "x$ISLINK" == x; then | |
41 | + if test "x$ISLINK" = x; then | 41 | + if test "x$ISLINK" = x; then | |
42 | # This is not a symbolic link! We are done! | 42 | # This is not a symbolic link! We are done! | |
43 | break | 43 | break | |
44 | fi | 44 | fi | |
45 | @@ -19643,7 +19643,7 @@ $as_echo_n "checking resolved symbolic l | 45 | @@ -19774,7 +19774,7 @@ $as_echo_n "checking resolved symbolic l | |
46 | # Resolve file symlinks | 46 | # Resolve file symlinks | |
47 | while test $COUNTER -lt 20; do | 47 | while test $COUNTER -lt 20; do | |
48 | ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'` | 48 | ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'` | |
49 | - if test "x$ISLINK" == x; then | 49 | - if test "x$ISLINK" == x; then | |
50 | + if test "x$ISLINK" = x; then | 50 | + if test "x$ISLINK" = x; then | |
51 | # This is not a symbolic link! We are done! | 51 | # This is not a symbolic link! We are done! | |
52 | break | 52 | break | |
53 | fi | 53 | fi | |
54 | @@ -20081,7 +20081,7 @@ $as_echo_n "checking for resolved symbol | 54 | @@ -20212,7 +20212,7 @@ $as_echo_n "checking for resolved symbol | |
55 | # Resolve file symlinks | 55 | # Resolve file symlinks | |
56 | while test $COUNTER -lt 20; do | 56 | while test $COUNTER -lt 20; do | |
57 | ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'` | 57 | ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'` | |
58 | - if test "x$ISLINK" == x; then | 58 | - if test "x$ISLINK" == x; then | |
59 | + if test "x$ISLINK" = x; then | 59 | + if test "x$ISLINK" = x; then | |
60 | # This is not a symbolic link! We are done! | 60 | # This is not a symbolic link! We are done! | |
61 | break | 61 | break | |
62 | fi | 62 | fi | |
63 | @@ -21244,7 +21244,7 @@ $as_echo_n "checking resolved symbolic l | 63 | @@ -21375,7 +21375,7 @@ $as_echo_n "checking resolved symbolic l | |
64 | # Resolve file symlinks | 64 | # Resolve file symlinks | |
65 | while test $COUNTER -lt 20; do | 65 | while test $COUNTER -lt 20; do | |
66 | ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'` | 66 | ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'` | |
67 | - if test "x$ISLINK" == x; then | 67 | - if test "x$ISLINK" == x; then | |
68 | + if test "x$ISLINK" = x; then | 68 | + if test "x$ISLINK" = x; then | |
69 | # This is not a symbolic link! We are done! | 69 | # This is not a symbolic link! We are done! | |
70 | break | 70 | break | |
71 | fi | 71 | fi | |
72 | @@ -21682,7 +21682,7 @@ $as_echo_n "checking for resolved symbol | 72 | @@ -21813,7 +21813,7 @@ $as_echo_n "checking for resolved symbol | |
73 | # Resolve file symlinks | 73 | # Resolve file symlinks | |
74 | while test $COUNTER -lt 20; do | 74 | while test $COUNTER -lt 20; do | |
75 | ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'` | 75 | ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'` | |
76 | - if test "x$ISLINK" == x; then | 76 | - if test "x$ISLINK" == x; then | |
77 | + if test "x$ISLINK" = x; then | 77 | + if test "x$ISLINK" = x; then | |
78 | # This is not a symbolic link! We are done! | 78 | # This is not a symbolic link! We are done! | |
79 | break | 79 | break | |
80 | fi | 80 | fi | |
81 | @@ -29731,7 +29731,7 @@ fi | 81 | @@ -29862,7 +29862,7 @@ fi | |
82 | # | 82 | # | |
83 | case $COMPILER_NAME in | 83 | case $COMPILER_NAME in | |
84 | gcc ) | 84 | gcc ) | |
85 | - CCXXFLAGS_JDK="$CCXXFLAGS $CCXXFLAGS_JDK -W -Wall -Wno-unused -Wno-parentheses \ | 85 | - CCXXFLAGS_JDK="$CCXXFLAGS $CCXXFLAGS_JDK -W -Wall -Wno-unused -Wno-parentheses \ | |
86 | + CCXXFLAGS_JDK="$CCXXFLAGS $CCXXFLAGS_JDK -W -Wall -Wno-unused -Wno-unused-parameter -Wno-parentheses \ | 86 | + CCXXFLAGS_JDK="$CCXXFLAGS $CCXXFLAGS_JDK -W -Wall -Wno-unused -Wno-unused-parameter -Wno-parentheses \ | |
87 | -pipe \ | 87 | -pipe \ | |
88 | -D_GNU_SOURCE -D_REENTRANT -D_LARGEFILE64_SOURCE" | 88 | -D_GNU_SOURCE -D_REENTRANT -D_LARGEFILE64_SOURCE" | |
89 | case $OPENJDK_TARGET_CPU_ARCH in | 89 | case $OPENJDK_TARGET_CPU_ARCH in | |
90 | @@ -30345,6 +30345,8 @@ $as_echo "alsa pulse x11" >&6; } | 90 | @@ -30475,7 +30475,8 @@ $as_echo "alsa pulse x11" >&6; } | |
91 | if test "x$OPENJDK_TARGET_OS" = xbsd; then | |||
91 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking what is not needed on BSD?" >&5 | 92 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking what is not needed on BSD?" >&5 | |
92 | $as_echo_n "checking what is not needed on BSD?... " >&6; } | 93 | $as_echo_n "checking what is not needed on BSD?... " >&6; } | |
93 | PULSE_NOT_NEEDED=yes | 94 | - if test "x$OPENJDK_TARGET_OS_VENDOR" = xopenbsd; then | |
94 | +# disable sound for now. XXX revisit this. | 95 | + if test "x$OPENJDK_TARGET_OS_VENDOR" = xopenbsd -o "x$OPENJDK_TARGET_OS_VENDOR" = xnetbsd; then | |
95 | + ALSA_NOT_NEEDED=yes | 96 | +# XXX revisit this | |
96 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: pulse" >&5 | 97 | ALSA_NOT_NEEDED=yes | |
97 | $as_echo "pulse" >&6; } | 98 | PULSE_NOT_NEEDED=yes | |
98 | fi | 99 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: alsa pulse" >&5 | |
99 | @@ -31555,7 +31557,11 @@ $as_echo "$as_me: WARNING: freetype not | 100 | @@ -31701,7 +31702,11 @@ $as_echo "$as_me: WARNING: freetype not | |
100 | 101 | |||
101 | # Allow --with-freetype-lib and --with-freetype-include to override | 102 | # Allow --with-freetype-lib and --with-freetype-include to override | |
102 | if test "x$with_freetype_include" != x; then | 103 | if test "x$with_freetype_include" != x; then | |
103 | - POTENTIAL_FREETYPE_INCLUDE_PATH="$with_freetype_include" | 104 | - POTENTIAL_FREETYPE_INCLUDE_PATH="$with_freetype_include" | |
104 | + POTENTIAL_FREETYPE_INCLUDE_PATH="$with_freetype_include" | 105 | + POTENTIAL_FREETYPE_INCLUDE_PATH="$with_freetype_include" | |
105 | + # deal w/ freetype2 in new location | 106 | + # deal w/ freetype2 in new location | |
106 | + if test -f "$with_freetype_include"/freetype2/ft2build.h; then | 107 | + if test -f "$with_freetype_include"/freetype2/ft2build.h; then | |
107 | + POTENTIAL_FREETYPE_INCLUDE_PATH="$with_freetype_include"/freetype2 | 108 | + POTENTIAL_FREETYPE_INCLUDE_PATH="$with_freetype_include"/freetype2 | |
108 | + fi | 109 | + fi | |
109 | fi | 110 | fi | |
110 | if test "x$with_freetype_lib" != x; then | 111 | if test "x$with_freetype_lib" != x; then | |
111 | POTENTIAL_FREETYPE_LIB_PATH="$with_freetype_lib" | 112 | POTENTIAL_FREETYPE_LIB_PATH="$with_freetype_lib" | |
112 | @@ -34373,7 +34379,7 @@ $as_echo "$as_me: The path of FREETYPE_I | 113 | @@ -34519,7 +34524,7 @@ $as_echo "$as_me: The path of FREETYPE_I | |
113 | FREETYPE_INCLUDE_PATH="`cd "$path"; $THEPWDCMD -L`" | 114 | FREETYPE_INCLUDE_PATH="`cd "$path"; $THEPWDCMD -L`" | |
114 | fi | 115 | fi | |
115 | 116 | |||
116 | - if test -d $FREETYPE_INCLUDE_PATH/freetype2/freetype; then | 117 | - if test -d $FREETYPE_INCLUDE_PATH/freetype2/freetype; then | |
117 | + if test -d $FREETYPE_INCLUDE_PATH/freetype2; then | 118 | + if test -d $FREETYPE_INCLUDE_PATH/freetype2; then | |
118 | FREETYPE_CFLAGS="-I$FREETYPE_INCLUDE_PATH/freetype2 -I$FREETYPE_INCLUDE_PATH" | 119 | FREETYPE_CFLAGS="-I$FREETYPE_INCLUDE_PATH/freetype2 -I$FREETYPE_INCLUDE_PATH" | |
119 | else | 120 | else | |
120 | FREETYPE_CFLAGS="-I$FREETYPE_INCLUDE_PATH" | 121 | FREETYPE_CFLAGS="-I$FREETYPE_INCLUDE_PATH" | |
121 | @@ -34506,7 +34512,7 @@ $as_echo "$as_me: The path of FREETYPE_L | 122 | @@ -34652,7 +34657,7 @@ $as_echo "$as_me: The path of FREETYPE_L | |
122 | if test "x$OPENJDK_TARGET_OS" = xwindows; then | 123 | if test "x$OPENJDK_TARGET_OS" = xwindows; then | |
123 | FREETYPE_LIBS="$FREETYPE_LIB_PATH/freetype.lib" | 124 | FREETYPE_LIBS="$FREETYPE_LIB_PATH/freetype.lib" | |
124 | else | 125 | else | |
125 | - FREETYPE_LIBS="-L$FREETYPE_LIB_PATH -lfreetype" | 126 | - FREETYPE_LIBS="-L$FREETYPE_LIB_PATH -lfreetype" | |
126 | + FREETYPE_LIBS="-Xlinker -R$FREETYPE_LIB_PATH -L$FREETYPE_LIB_PATH -lfreetype" | 127 | + FREETYPE_LIBS="-Xlinker -R$FREETYPE_LIB_PATH -L$FREETYPE_LIB_PATH -lfreetype" | |
127 | fi | 128 | fi | |
128 | fi | 129 | fi | |
129 | 130 |
@@ -1,36 +1,39 @@ | @@ -1,36 +1,39 @@ | |||
1 | $NetBSD: patch-hotspot_src_os_posix_vm_os__posix.cpp,v 1.1 2015/02/08 08:41:25 tnn Exp $ | 1 | $NetBSD: patch-hotspot_src_os_posix_vm_os__posix.cpp,v 1.2 2015/06/10 11:38:51 tnn Exp $ | |
2 | 2 | |||
3 | rlim_t fixes. | 3 | rlim_t fixes. | |
4 | 4 | |||
5 | --- hotspot/src/os/posix/vm/os_posix.cpp.orig 2015-02-02 15:32:37.000000000 +0000 | 5 | --- hotspot/src/os/posix/vm/os_posix.cpp.orig 2015-06-09 13:49:55.000000000 +0000 | |
6 | +++ hotspot/src/os/posix/vm/os_posix.cpp | 6 | +++ hotspot/src/os/posix/vm/os_posix.cpp | |
7 | @@ -160,12 +160,12 @@ void os::Posix::print_rlimit_info(output | 7 | @@ -180,12 +180,12 @@ void os::Posix::print_rlimit_info(output | |
8 | 8 | |||
9 | st->print(" STACK "); | 9 | st->print(" STACK "); | |
10 | getrlimit(RLIMIT_STACK, &rlim); | 10 | getrlimit(RLIMIT_STACK, &rlim); | |
11 | - if (rlim.rlim_cur == RLIM_INFINITY) st->print("infinity"); | 11 | - if (rlim.rlim_cur == RLIM_INFINITY) st->print("infinity"); | |
12 | + if (rlim.rlim_cur == (rlim_t)RLIM_INFINITY) st->print("infinity"); | 12 | + if (rlim.rlim_cur == (rlim_t)RLIM_INFINITY) st->print("infinity"); | |
13 | else st->print("%uk", rlim.rlim_cur >> 10); | 13 | else st->print("%uk", rlim.rlim_cur >> 10); | |
14 | 14 | |||
15 | st->print(", CORE "); | 15 | st->print(", CORE "); | |
16 | getrlimit(RLIMIT_CORE, &rlim); | 16 | getrlimit(RLIMIT_CORE, &rlim); | |
17 | - if (rlim.rlim_cur == RLIM_INFINITY) st->print("infinity"); | 17 | - if (rlim.rlim_cur == RLIM_INFINITY) st->print("infinity"); | |
18 | + if (rlim.rlim_cur == (rlim_t)RLIM_INFINITY) st->print("infinity"); | 18 | + if (rlim.rlim_cur == (rlim_t)RLIM_INFINITY) st->print("infinity"); | |
19 | else st->print("%uk", rlim.rlim_cur >> 10); | 19 | else st->print("%uk", rlim.rlim_cur >> 10); | |
20 | 20 | |||
21 | // Isn't there on solaris | 21 | // Isn't there on solaris | |
22 | @@ -178,12 +178,12 @@ void os::Posix::print_rlimit_info(output | 22 | @@ -198,7 +198,7 @@ void os::Posix::print_rlimit_info(output | |
23 | 23 | |||
24 | st->print(", NOFILE "); | 24 | st->print(", NOFILE "); | |
25 | getrlimit(RLIMIT_NOFILE, &rlim); | 25 | getrlimit(RLIMIT_NOFILE, &rlim); | |
26 | - if (rlim.rlim_cur == RLIM_INFINITY) st->print("infinity"); | 26 | - if (rlim.rlim_cur == RLIM_INFINITY) st->print("infinity"); | |
27 | + if (rlim.rlim_cur == (rlim_t)RLIM_INFINITY) st->print("infinity"); | 27 | + if (rlim.rlim_cur == (rlim_t)RLIM_INFINITY) st->print("infinity"); | |
28 | else st->print("%d", rlim.rlim_cur); | 28 | else st->print("%d", rlim.rlim_cur); | |
29 | 29 | |||
30 | #ifdef __OpenBSD__ | |||
31 | @@ -208,7 +208,7 @@ void os::Posix::print_rlimit_info(output | |||
30 | st->print(", AS "); | 32 | st->print(", AS "); | |
31 | getrlimit(RLIMIT_AS, &rlim); | 33 | getrlimit(RLIMIT_AS, &rlim); | |
34 | #endif | |||
32 | - if (rlim.rlim_cur == RLIM_INFINITY) st->print("infinity"); | 35 | - if (rlim.rlim_cur == RLIM_INFINITY) st->print("infinity"); | |
33 | + if (rlim.rlim_cur == (rlim_t)RLIM_INFINITY) st->print("infinity"); | 36 | + if (rlim.rlim_cur == (rlim_t)RLIM_INFINITY) st->print("infinity"); | |
34 | else st->print("%uk", rlim.rlim_cur >> 10); | 37 | else st->print("%uk", rlim.rlim_cur >> 10); | |
35 | st->cr(); | 38 | st->cr(); | |
36 | } | 39 | } |
@@ -1,13 +1,13 @@ | @@ -1,13 +1,13 @@ | |||
1 | $NetBSD: patch-jdk_make_lib_SoundLibraries.gmk,v 1.1 2015/02/08 08:41:25 tnn Exp $ | 1 | $NetBSD: patch-jdk_make_lib_SoundLibraries.gmk,v 1.2 2015/06/10 11:38:51 tnn Exp $ | |
2 | 2 | |||
3 | --- jdk/make/lib/SoundLibraries.gmk.orig 2015-02-02 15:37:11.000000000 +0000 | 3 | --- jdk/make/lib/SoundLibraries.gmk.orig 2015-06-09 13:56:39.000000000 +0000 | |
4 | +++ jdk/make/lib/SoundLibraries.gmk | 4 | +++ jdk/make/lib/SoundLibraries.gmk | |
5 | @@ -76,7 +76,7 @@ ifeq ($(OPENJDK_TARGET_OS), aix) | 5 | @@ -76,7 +76,7 @@ ifeq ($(OPENJDK_TARGET_OS), aix) | |
6 | endif # OPENJDK_TARGET_OS aix | 6 | endif # OPENJDK_TARGET_OS aix | |
7 | 7 | |||
8 | ifeq ($(OPENJDK_TARGET_OS), bsd) | 8 | ifeq ($(OPENJDK_TARGET_OS), bsd) | |
9 | - EXTRA_SOUND_JNI_LIBS += jsoundalsa | 9 | - ifneq ($(OPENJDK_TARGET_OS_VENDOR), openbsd) | |
10 | +# EXTRA_SOUND_JNI_LIBS += jsoundalsa | 10 | + ifeq (, $(filter $(OPENJDK_TARGET_OS_VENDOR), netbsd openbsd)) | |
11 | EXTRA_SOUND_JNI_LIBS += jsoundalsa | |||
12 | endif # OPENJDK_TARGET_OS_VENDOR openbsd | |||
11 | LIBJSOUND_CFLAGS += -DX_PLATFORM=X_BSD | 13 | LIBJSOUND_CFLAGS += -DX_PLATFORM=X_BSD | |
12 | endif # OPENJDK_TARGET_OS bsd | |||
13 |
@@ -1,54 +1,55 @@ | @@ -1,54 +1,55 @@ | |||
1 | $NetBSD: patch-jdk_src_solaris_native_java_net_NetworkInterface.c,v 1.1 2015/02/08 08:41:25 tnn Exp $ | 1 | $NetBSD: patch-jdk_src_solaris_native_java_net_NetworkInterface.c,v 1.2 2015/06/10 11:38:51 tnn Exp $ | |
2 | 2 | |||
3 | Zones support. | 3 | Zones support. | |
4 | 4 | |||
5 | --- jdk/src/solaris/native/java/net/NetworkInterface.c.orig 2015-02-02 15:37:12.000000000 +0000 | 5 | --- jdk/src/solaris/native/java/net/NetworkInterface.c.orig 2015-06-09 13:56:55.000000000 +0000 | |
6 | +++ jdk/src/solaris/native/java/net/NetworkInterface.c | 6 | +++ jdk/src/solaris/native/java/net/NetworkInterface.c | |
7 | @@ -43,6 +43,7 @@ | 7 | @@ -43,6 +43,7 @@ | |
8 | #include <fcntl.h> | 8 | #include <fcntl.h> | |
9 | #include <stropts.h> | 9 | #include <stropts.h> | |
10 | #include <sys/sockio.h> | 10 | #include <sys/sockio.h> | |
11 | +#include <zone.h> | 11 | +#include <zone.h> | |
12 | #endif | 12 | #endif | |
13 | 13 | |||
14 | #ifdef __linux__ | 14 | #ifdef __linux__ | |
15 | @@ -67,13 +68,11 @@ | 15 | @@ -67,14 +68,12 @@ | |
16 | #include <sys/param.h> | 16 | #include <sys/param.h> | |
17 | #include <sys/ioctl.h> | 17 | #include <sys/ioctl.h> | |
18 | #include <sys/sockio.h> | 18 | #include <sys/sockio.h> | |
19 | -#if defined(__APPLE__) || defined(__FreeBSD__) | 19 | -#if defined(__APPLE__) || defined(__FreeBSD__) | |
20 | +#if defined(__APPLE__) || defined(__FreeBSD__) || defined(__DragonFly__) | 20 | +#if defined(__APPLE__) || defined(__FreeBSD__) || defined(__DragonFly__) | |
21 | #include <net/ethernet.h> | 21 | #include <net/ethernet.h> | |
22 | #include <net/if_var.h> | 22 | #include <net/if_var.h> | |
23 | -#elif defined(__OpenBSD__) | 23 | -#elif defined(__OpenBSD__) | |
24 | +#elif defined(__OpenBSD__) || defined(__NetBSD__) | 24 | +#elif defined(__OpenBSD__) || defined(__NetBSD__) | |
25 | #include <netinet/if_ether.h> | 25 | #include <netinet/if_ether.h> | |
26 | #include <netinet6/in6_var.h> | |||
26 | -#elif defined(__NetBSD__) | 27 | -#elif defined(__NetBSD__) | |
27 | -#include <net/if_ether.h> | 28 | -#include <net/if_ether.h> | |
28 | #endif | 29 | #endif | |
29 | #include <net/if_dl.h> | 30 | #include <net/if_dl.h> | |
30 | #include <netinet/in_var.h> | 31 | #include <netinet/in_var.h> | |
31 | @@ -1748,7 +1747,8 @@ static short getSubnet(JNIEnv *env, int | 32 | @@ -1749,7 +1748,8 @@ static short getSubnet(JNIEnv *env, int | |
32 | 33 | |||
33 | 34 | |||
34 | 35 | |||
35 | -#define DEV_PREFIX "/dev/" | 36 | -#define DEV_PREFIX "/dev/" | |
36 | +#define NET_DEV_PREFIX "/dev/" | 37 | +#define NET_DEV_PREFIX "/dev/" | |
37 | +#define ZONE_NET_DEV_PREFIX "/dev/net/" | 38 | +#define ZONE_NET_DEV_PREFIX "/dev/net/" | |
38 | 39 | |||
39 | /** | 40 | /** | |
40 | * Solaris specific DLPI code to get hardware address from a device. | 41 | * Solaris specific DLPI code to get hardware address from a device. | |
41 | @@ -1765,11 +1765,18 @@ static int getMacFromDevice(JNIEnv *env, | 42 | @@ -1766,11 +1766,18 @@ static int getMacFromDevice(JNIEnv *env, | |
42 | int flags = 0; | 43 | int flags = 0; | |
43 | 44 | |||
44 | /** | 45 | /** | |
45 | - * Device is in /dev | 46 | - * Device is in /dev | |
46 | + * Device is in /dev in global zone / standalone | 47 | + * Device is in /dev in global zone / standalone | |
47 | * e.g.: /dev/bge0 | 48 | * e.g.: /dev/bge0 | |
48 | + * Device is in /dev/net in a zone | 49 | + * Device is in /dev/net in a zone | |
49 | + * e.g.: /dev/net/net0 | 50 | + * e.g.: /dev/net/net0 | |
50 | */ | 51 | */ | |
51 | - strcpy(style1dev, DEV_PREFIX); | 52 | - strcpy(style1dev, DEV_PREFIX); | |
52 | + if (getzoneid()==(zoneid_t)GLOBAL_ZONEID) { | 53 | + if (getzoneid()==(zoneid_t)GLOBAL_ZONEID) { | |
53 | + strcpy(style1dev, NET_DEV_PREFIX); | 54 | + strcpy(style1dev, NET_DEV_PREFIX); | |
54 | + } else { | 55 | + } else { |