. Update to 8u72.
This commit is contained in:
Greg Lewis
@@ -2,7 +2,6 @@
|
||||
|
||||
PORTNAME= openjdk
|
||||
PORTVERSION= ${JDK_MAJOR_VERSION}.${JDK_UPDATE_VERSION}.${JDK_BUILD_NUMBER:S/^0//}
|
||||
PORTREVISION= 3
|
||||
CATEGORIES= java devel
|
||||
MASTER_SITES= http://download.java.net/openjdk/jdk${JDK_MAJOR_VERSION}/promoted/b${DIST_BUILD_NUMBER}/:jdk \
|
||||
https://adopt-openjdk.ci.cloudbees.com/job/jtreg/${JTREG_JENKINS_BUILD}/artifact/:jtreg \
|
||||
@@ -21,7 +20,8 @@ PATCHFILES= patch-8u05-b13.xz \
|
||||
patch-8u45-b14.xz \
|
||||
patch-8u51-b16.xz \
|
||||
patch-8u60-b23.xz \
|
||||
patch-8u66-b17.xz
|
||||
patch-8u66-b17-1.xz \
|
||||
patch-8u72-b15.xz
|
||||
|
||||
MAINTAINER= java@FreeBSD.org
|
||||
COMMENT?= Java Development Kit ${JDK_MAJOR_VERSION}
|
||||
@@ -199,8 +199,8 @@ NO_CCACHE= yes
|
||||
NOPRECIOUSMAKEVARS= yes
|
||||
|
||||
JDK_MAJOR_VERSION= 8
|
||||
JDK_UPDATE_VERSION= 66
|
||||
JDK_BUILD_NUMBER= 17
|
||||
JDK_UPDATE_VERSION= 72
|
||||
JDK_BUILD_NUMBER= 15
|
||||
DIST_BUILD_NUMBER= 132
|
||||
JTREG_VERSION= 4.1
|
||||
JTREG_BUILD_NUMBER= b08
|
||||
|
||||
@@ -20,5 +20,7 @@ SHA256 (patch-8u51-b16.xz) = 146e8ffa75911a2bc53099ea07625db259f88cbac2e678f965f
|
||||
SIZE (patch-8u51-b16.xz) = 71144
|
||||
SHA256 (patch-8u60-b23.xz) = 8ebe80e8add9e61dcb43e9be756ccc6d566a39748e7726f265df73af2d082798
|
||||
SIZE (patch-8u60-b23.xz) = 1043720
|
||||
SHA256 (patch-8u66-b17.xz) = a9ab2649c4f107c0399b8ce953d5d8cb683bee959446ef5df9a3c9d5c682bf9b
|
||||
SIZE (patch-8u66-b17.xz) = 185576
|
||||
SHA256 (patch-8u66-b17-1.xz) = 8d11cf62d9b70857d1008dea0cdcf9d5b4ba30320696cb2568a8bc13f202bb2e
|
||||
SIZE (patch-8u66-b17-1.xz) = 351328
|
||||
SHA256 (patch-8u72-b15.xz) = 42f774b72f3dbdbfadc63d0b8fb7d94c51c3062d80aedec86f59d295823136d1
|
||||
SIZE (patch-8u72-b15.xz) = 282984
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@@ -1,11 +0,0 @@
|
||||
--- common/autoconf/build-performance.m4 Sat Oct 24 06:20:56 2015 -0700
|
||||
+++ common/autoconf/build-performance.m4 Wed Jan 20 21:11:23 2016 -0800
|
||||
@@ -212,7 +212,7 @@
|
||||
# Only use ccache if it is 3.1.4 or later, which supports
|
||||
# precompiled headers.
|
||||
AC_MSG_CHECKING([if ccache supports precompiled headers])
|
||||
- HAS_GOOD_CCACHE=`($CCACHE --version | head -n 1 | awk '{ split($3, a, "."); if (a@<:@1@:>@ >= 3 && (a@<:@2@:>@ > 1 || (a@<:@2@:>@ == 1 && a@<:@3@:>@ >= 4))) print "yes"; else print "no"; }') 2> /dev/null`
|
||||
+ HAS_GOOD_CCACHE=`($CCACHE --version | head -n 1 | awk '{ split(@S|@3, a, "."); if (a@<:@1@:>@ >= 3 && (a@<:@2@:>@ > 1 || (a@<:@2@:>@ == 1 && a@<:@3@:>@ >= 4))) print "yes"; else print "no"; }') 2> /dev/null`
|
||||
if test "x$HAS_GOOD_CCACHE" = xyes; then
|
||||
AC_MSG_RESULT([no, disabling ccache])
|
||||
CCACHE=
|
||||
@@ -1,11 +0,0 @@
|
||||
--- common/autoconf/generated-configure.sh Sat Oct 24 06:20:56 2015 -0700
|
||||
+++ common/autoconf/generated-configure.sh Wed Jan 20 21:11:45 2016 -0800
|
||||
@@ -36324,7 +36324,7 @@
|
||||
# precompiled headers.
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if ccache supports precompiled headers" >&5
|
||||
$as_echo_n "checking if ccache supports precompiled headers... " >&6; }
|
||||
- HAS_GOOD_CCACHE=`($CCACHE --version | head -n 1 | awk '{ split(, a, "."); if (a[1] >= 3 && (a[2] > 1 || (a[2] == 1 && a[3] >= 4))) print "yes"; else print "no"; }') 2> /dev/null`
|
||||
+ HAS_GOOD_CCACHE=`($CCACHE --version | head -n 1 | awk '{ split($3, a, "."); if (a[1] >= 3 && (a[2] > 1 || (a[2] == 1 && a[3] >= 4))) print "yes"; else print "no"; }') 2> /dev/null`
|
||||
if test "x$HAS_GOOD_CCACHE" = xyes; then
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no, disabling ccache" >&5
|
||||
$as_echo "no, disabling ccache" >&6; }
|
||||
@@ -1,28 +0,0 @@
|
||||
--- common/autoconf/boot-jdk.m4.orig 2015-12-09 21:04:26 UTC
|
||||
+++ common/autoconf/boot-jdk.m4
|
||||
@@ -289,6 +289,16 @@ AC_DEFUN_ONCE([BOOTJDK_SETUP_BOOT_JDK],
|
||||
BOOT_JDK_SOURCETARGET="-source 7 -target 7"
|
||||
AC_SUBST(BOOT_JDK_SOURCETARGET)
|
||||
AC_SUBST(JAVAC_FLAGS)
|
||||
+
|
||||
+ # Check if the boot jdk is 32 or 64 bit
|
||||
+ if "$JAVA" -d64 -version > /dev/null 2>&1; then
|
||||
+ BOOT_JDK_BITS="64"
|
||||
+ else
|
||||
+ BOOT_JDK_BITS="32"
|
||||
+ fi
|
||||
+ AC_MSG_CHECKING([if Boot JDK is 32 or 64 bits])
|
||||
+ AC_MSG_RESULT([$BOOT_JDK_BITS])
|
||||
+ AC_SUBST(BOOT_JDK_BITS)
|
||||
])
|
||||
|
||||
AC_DEFUN_ONCE([BOOTJDK_SETUP_BOOT_JDK_ARGUMENTS],
|
||||
@@ -323,7 +333,7 @@ AC_DEFUN_ONCE([BOOTJDK_SETUP_BOOT_JDK_AR
|
||||
|
||||
# Maximum amount of heap memory.
|
||||
# Maximum stack size.
|
||||
- if test "x$BUILD_NUM_BITS" = x32; then
|
||||
+ if test "x$BOOT_JDK_BITS" = x32; then
|
||||
JVM_MAX_HEAP=1100M
|
||||
STACK_SIZE=768
|
||||
else
|
||||
@@ -1,45 +0,0 @@
|
||||
--- /dev/null 2016-01-01 15:03:12.000000000 -0800
|
||||
+++ jdk/src/solaris/native/sun/management/BsdOperatingSystem.c 2016-01-01 15:01:40.593188000 -0800
|
||||
@@ -0,0 +1,42 @@
|
||||
+/*
|
||||
+ * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
|
||||
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
+ *
|
||||
+ * This code is free software; you can redistribute it and/or modify it
|
||||
+ * under the terms of the GNU General Public License version 2 only, as
|
||||
+ * published by the Free Software Foundation. Oracle designates this
|
||||
+ * particular file as subject to the "Classpath" exception as provided
|
||||
+ * by Oracle in the LICENSE file that accompanied this code.
|
||||
+ *
|
||||
+ * This code is distributed in the hope that it will be useful, but WITHOUT
|
||||
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
+ * version 2 for more details (a copy is included in the LICENSE file that
|
||||
+ * accompanied this code).
|
||||
+ *
|
||||
+ * You should have received a copy of the GNU General Public License version
|
||||
+ * 2 along with this work; if not, write to the Free Software Foundation,
|
||||
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
+ *
|
||||
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
|
||||
+ * or visit www.oracle.com if you need additional information or have any
|
||||
+ * questions.
|
||||
+ */
|
||||
+
|
||||
+#include <jni.h>
|
||||
+#include "jvm.h"
|
||||
+#include "sun_management_OperatingSystemImpl.h"
|
||||
+
|
||||
+JNIEXPORT jdouble JNICALL
|
||||
+Java_sun_management_OperatingSystemImpl_getSystemCpuLoad
|
||||
+(JNIEnv *env, jobject dummy)
|
||||
+{
|
||||
+ return (jdouble) -1;
|
||||
+}
|
||||
+
|
||||
+JNIEXPORT jdouble JNICALL
|
||||
+Java_sun_management_OperatingSystemImpl_getProcessCpuLoad
|
||||
+(JNIEnv *env, jobject dummy)
|
||||
+{
|
||||
+ return (jdouble) -1;
|
||||
+}
|
||||
Reference in New Issue
Block a user