summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--java/openjdk11/Makefile2
-rw-r--r--java/openjdk11/distinfo6
-rw-r--r--java/openjdk11/files/patch-make-autoconf-build-performance.m413
3 files changed, 4 insertions, 17 deletions
diff --git a/java/openjdk11/Makefile b/java/openjdk11/Makefile
index 0b8f40fea243..649e5ba183bc 100644
--- a/java/openjdk11/Makefile
+++ b/java/openjdk11/Makefile
@@ -54,7 +54,7 @@ JDK_MAJOR_VERSION= 11
JDK_MINOR_VERSION= 0
JDK_PATCH_VERSION= 2
JDK_BUILD_NUMBER= 9
-BSD_JDK_VERSION= 1
+BSD_JDK_VERSION= 2
GNU_CONFIGURE= yes
CONFIGURE_ENV= CC=/usr/bin/cc \
diff --git a/java/openjdk11/distinfo b/java/openjdk11/distinfo
index d282aff42600..49b3879aa886 100644
--- a/java/openjdk11/distinfo
+++ b/java/openjdk11/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1552339500
-SHA256 (jdk-11.0.2+9-1.tar.gz) = 013e7bc9e74f23b901a1ba295aedc85ddc2ee3dd115728a0178b637a45c4133f
-SIZE (jdk-11.0.2+9-1.tar.gz) = 116710015
+TIMESTAMP = 1553112684
+SHA256 (jdk-11.0.2+9-2.tar.gz) = 00dbb8e268b9ce2311d5ce95ec18f11524e1ffc5f80d3859bd9a3d6f6b652379
+SIZE (jdk-11.0.2+9-2.tar.gz) = 116739508
diff --git a/java/openjdk11/files/patch-make-autoconf-build-performance.m4 b/java/openjdk11/files/patch-make-autoconf-build-performance.m4
deleted file mode 100644
index 04aa1f5e707a..000000000000
--- a/java/openjdk11/files/patch-make-autoconf-build-performance.m4
+++ /dev/null
@@ -1,13 +0,0 @@
---- make/autoconf/build-performance.m4
-+++ make/autoconf/build-performance.m4
-@@ -41,6 +41,10 @@ AC_DEFUN([BPERF_CHECK_CORES],
- # Looks like a MacOSX system
- NUM_CORES=`/usr/sbin/sysctl -n hw.ncpu`
- FOUND_CORES=yes
-+ elif test -x /sbin/sysctl; then
-+ # Looks like a BSD system
-+ NUM_CORES=`/sbin/sysctl -n hw.ncpu`
-+ FOUND_CORES=yes
- elif test "x$OPENJDK_BUILD_OS" = xaix ; then
- NUM_CORES=`/usr/sbin/prtconf | grep "^Number Of Processors" | awk '{ print [$]4 }'`
- FOUND_CORES=yes