diff options
| author | Greg Lewis <glewis@FreeBSD.org> | 2019-08-13 13:32:12 +0000 |
|---|---|---|
| committer | Greg Lewis <glewis@FreeBSD.org> | 2019-08-13 13:32:12 +0000 |
| commit | dc20dd8e50334453dcc136f5fea378f9384bcf90 (patch) | |
| tree | 53e6aefaa4807086c9e98ac3e974395a3ecfda19 /java/openjdk12 | |
| parent | 12b027088660835baca10415bbf49a09659b4bad (diff) | |
| download | ports-dc20dd8e50334453dcc136f5fea378f9384bcf90.tar.gz ports-dc20dd8e50334453dcc136f5fea378f9384bcf90.zip | |
Update to 12.0.2+10.2
Notes
Notes:
svn path=/head/; revision=508822
Diffstat (limited to 'java/openjdk12')
| -rw-r--r-- | java/openjdk12/Makefile | 3 | ||||
| -rw-r--r-- | java/openjdk12/distinfo | 6 | ||||
| -rw-r--r-- | java/openjdk12/files/patch-make_autoconf_libraries.m4 | 16 | ||||
| -rw-r--r-- | java/openjdk12/files/patch-src_hotspot_os__cpu_bsd__x86_os__bsd__x86.cpp | 12 |
4 files changed, 24 insertions, 13 deletions
diff --git a/java/openjdk12/Makefile b/java/openjdk12/Makefile index a8884e6afbd4..8df32825c4ec 100644 --- a/java/openjdk12/Makefile +++ b/java/openjdk12/Makefile @@ -3,7 +3,6 @@ PORTNAME= openjdk DISTVERSIONPREFIX= jdk- DISTVERSION= ${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_PATCH_VERSION}+${JDK_BUILD_NUMBER}-${BSD_JDK_VERSION} -PORTREVISION= 1 CATEGORIES= java devel PKGNAMESUFFIX?= ${JDK_MAJOR_VERSION} @@ -57,7 +56,7 @@ JDK_MAJOR_VERSION= 12 JDK_MINOR_VERSION= 0 JDK_PATCH_VERSION= 2 JDK_BUILD_NUMBER= 10 -BSD_JDK_VERSION= 1 +BSD_JDK_VERSION= 2 GNU_CONFIGURE= yes CONFIGURE_ENV= CC=/usr/bin/cc \ diff --git a/java/openjdk12/distinfo b/java/openjdk12/distinfo index c6add0d20381..e81aac7cc37d 100644 --- a/java/openjdk12/distinfo +++ b/java/openjdk12/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1563554636 -SHA256 (battleblow-openjdk-jdk12u-jdk-12.0.2+10-1_GH0.tar.gz) = 3fb583b455007a84ef790d72a73232aef2c18c9fba07e84f71e32a63503241fc -SIZE (battleblow-openjdk-jdk12u-jdk-12.0.2+10-1_GH0.tar.gz) = 110435414 +TIMESTAMP = 1565671800 +SHA256 (battleblow-openjdk-jdk12u-jdk-12.0.2+10-2_GH0.tar.gz) = 7038f9264880a343334e5a80c59ac6265e32ed6e9cff0d122b0a7f70826fde67 +SIZE (battleblow-openjdk-jdk12u-jdk-12.0.2+10-2_GH0.tar.gz) = 110452445 diff --git a/java/openjdk12/files/patch-make_autoconf_libraries.m4 b/java/openjdk12/files/patch-make_autoconf_libraries.m4 index 11f8769f67c6..0911464a6522 100644 --- a/java/openjdk12/files/patch-make_autoconf_libraries.m4 +++ b/java/openjdk12/files/patch-make_autoconf_libraries.m4 @@ -1,15 +1,15 @@ ---- make/autoconf/libraries.m4.orig 2019-03-28 16:54:58.823145000 -0700 -+++ make/autoconf/libraries.m4 2019-03-28 16:55:45.533206000 -0700 -@@ -186,9 +186,9 @@ +--- make/autoconf/libraries.m4~ 2019-08-12 19:10:36.292217000 -0700 ++++ make/autoconf/libraries.m4 2019-08-12 19:18:15.523606000 -0700 +@@ -188,9 +188,9 @@ ICONV_LDFLAGS="-L/usr/local/lib" ICONV_LIBS=-liconv - else -- ICONV_CFLAGS= + elif test "x$OPENJDK_TARGET_OS_ENV" = "xbsd.freebsd"; then +- ICONV_CFLAGS=-DLIBICONV_PLUG - ICONV_LDFLAGS= - ICONV_LIBS= + ICONV_CFLAGS=%%ICONV_CFLAGS%% + ICONV_LDFLAGS=%%ICONV_LDFLAGS%% + ICONV_LIBS=%%ICONV_LIBS%% - fi - else - ICONV_CFLAGS= + else + ICONV_CFLAGS= + ICONV_LDFLAGS= diff --git a/java/openjdk12/files/patch-src_hotspot_os__cpu_bsd__x86_os__bsd__x86.cpp b/java/openjdk12/files/patch-src_hotspot_os__cpu_bsd__x86_os__bsd__x86.cpp new file mode 100644 index 000000000000..701059058259 --- /dev/null +++ b/java/openjdk12/files/patch-src_hotspot_os__cpu_bsd__x86_os__bsd__x86.cpp @@ -0,0 +1,12 @@ +--- src/hotspot/os_cpu/bsd_x86/os_bsd_x86.cpp ++++ src/hotspot/os_cpu/bsd_x86/os_bsd_x86.cpp +@@ -510,6 +510,9 @@ JVM_handle_bsd_signal(int sig, + // Handle ALL stack overflow variations here + if (sig == SIGSEGV || sig == SIGBUS) { + address addr = (address) info->si_addr; ++#ifdef __FreeBSD__ ++ addr = align_down(addr, os::vm_page_size()); ++#endif + + // check if fault address is within thread stack + if (thread->on_local_stack(addr)) { |