From owner-svn-ports-head@freebsd.org Tue Aug 13 13:32:14 2019 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id B459DAF9B3; Tue, 13 Aug 2019 13:32:14 +0000 (UTC) (envelope-from glewis@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 467DCf3ffyz3M2t; Tue, 13 Aug 2019 13:32:14 +0000 (UTC) (envelope-from glewis@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id F0B8B181CF; Tue, 13 Aug 2019 13:32:13 +0000 (UTC) (envelope-from glewis@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x7DDWDw3029650; Tue, 13 Aug 2019 13:32:13 GMT (envelope-from glewis@FreeBSD.org) Received: (from glewis@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x7DDWDTt029646; Tue, 13 Aug 2019 13:32:13 GMT (envelope-from glewis@FreeBSD.org) Message-Id: <201908131332.x7DDWDTt029646@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: glewis set sender to glewis@FreeBSD.org using -f From: Greg Lewis Date: Tue, 13 Aug 2019 13:32:13 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r508822 - in head/java/openjdk12: . files X-SVN-Group: ports-head X-SVN-Commit-Author: glewis X-SVN-Commit-Paths: in head/java/openjdk12: . files X-SVN-Commit-Revision: 508822 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 13 Aug 2019 13:32:14 -0000 Author: glewis Date: Tue Aug 13 13:32:12 2019 New Revision: 508822 URL: https://svnweb.freebsd.org/changeset/ports/508822 Log: Update to 12.0.2+10.2 Added: head/java/openjdk12/files/patch-src_hotspot_os__cpu_bsd__x86_os__bsd__x86.cpp (contents, props changed) Modified: head/java/openjdk12/Makefile head/java/openjdk12/distinfo head/java/openjdk12/files/patch-make_autoconf_libraries.m4 Modified: head/java/openjdk12/Makefile ============================================================================== --- head/java/openjdk12/Makefile Tue Aug 13 11:33:56 2019 (r508821) +++ head/java/openjdk12/Makefile Tue Aug 13 13:32:12 2019 (r508822) @@ -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 \ Modified: head/java/openjdk12/distinfo ============================================================================== --- head/java/openjdk12/distinfo Tue Aug 13 11:33:56 2019 (r508821) +++ head/java/openjdk12/distinfo Tue Aug 13 13:32:12 2019 (r508822) @@ -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 Modified: head/java/openjdk12/files/patch-make_autoconf_libraries.m4 ============================================================================== --- head/java/openjdk12/files/patch-make_autoconf_libraries.m4 Tue Aug 13 11:33:56 2019 (r508821) +++ head/java/openjdk12/files/patch-make_autoconf_libraries.m4 Tue Aug 13 13:32:12 2019 (r508822) @@ -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= Added: head/java/openjdk12/files/patch-src_hotspot_os__cpu_bsd__x86_os__bsd__x86.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/java/openjdk12/files/patch-src_hotspot_os__cpu_bsd__x86_os__bsd__x86.cpp Tue Aug 13 13:32:12 2019 (r508822) @@ -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)) {