From owner-svn-ports-head@freebsd.org Tue Aug 13 04:41:42 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 3901FCB5F0; Tue, 13 Aug 2019 04:41:42 +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 4670RV0j8mz4PdY; Tue, 13 Aug 2019 04:41:42 +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 EE1A19EDB; Tue, 13 Aug 2019 04:41:41 +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 x7D4ff86017876; Tue, 13 Aug 2019 04:41:41 GMT (envelope-from glewis@FreeBSD.org) Received: (from glewis@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x7D4ffNs017871; Tue, 13 Aug 2019 04:41:41 GMT (envelope-from glewis@FreeBSD.org) Message-Id: <201908130441.x7D4ffNs017871@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 04:41:41 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r508812 - in head/java/openjdk11: . files X-SVN-Group: ports-head X-SVN-Commit-Author: glewis X-SVN-Commit-Paths: in head/java/openjdk11: . files X-SVN-Commit-Revision: 508812 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 04:41:42 -0000 Author: glewis Date: Tue Aug 13 04:41:40 2019 New Revision: 508812 URL: https://svnweb.freebsd.org/changeset/ports/508812 Log: Update to 11.0.4+11.2 Added: head/java/openjdk11/files/patch-src_hotspot_os__cpu_bsd__x86_os__bsd__x86.cpp (contents, props changed) Deleted: head/java/openjdk11/files/patch-src_hotspot_os__cpu_bsd__ppc_os__bsd__ppc.cpp Modified: head/java/openjdk11/Makefile head/java/openjdk11/distinfo head/java/openjdk11/files/patch-make_autoconf_libraries.m4 Modified: head/java/openjdk11/Makefile ============================================================================== --- head/java/openjdk11/Makefile Tue Aug 13 03:22:44 2019 (r508811) +++ head/java/openjdk11/Makefile Tue Aug 13 04:41:40 2019 (r508812) @@ -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= 2 CATEGORIES= java devel PKGNAMESUFFIX?= ${JDK_MAJOR_VERSION} @@ -57,7 +56,7 @@ JDK_MAJOR_VERSION= 11 JDK_MINOR_VERSION= 0 JDK_PATCH_VERSION= 4 JDK_BUILD_NUMBER= 11 -BSD_JDK_VERSION= 1 +BSD_JDK_VERSION= 2 GNU_CONFIGURE= yes CONFIGURE_ENV= CC=${CC} \ Modified: head/java/openjdk11/distinfo ============================================================================== --- head/java/openjdk11/distinfo Tue Aug 13 03:22:44 2019 (r508811) +++ head/java/openjdk11/distinfo Tue Aug 13 04:41:40 2019 (r508812) @@ -1,3 +1,3 @@ -TIMESTAMP = 1563553365 -SHA256 (battleblow-openjdk-jdk11u-jdk-11.0.4+11-1_GH0.tar.gz) = eed0b1dc30d16e14ef470186c9fe21c36e02da95f2657754b8402e84b803965c -SIZE (battleblow-openjdk-jdk11u-jdk-11.0.4+11-1_GH0.tar.gz) = 116997649 +TIMESTAMP = 1565662004 +SHA256 (battleblow-openjdk-jdk11u-jdk-11.0.4+11-2_GH0.tar.gz) = 15fdeeea8d716620ab78a44e66edf88eeb7707a9b7b389304f2ba6fd39d5fa36 +SIZE (battleblow-openjdk-jdk11u-jdk-11.0.4+11-2_GH0.tar.gz) = 117004198 Modified: head/java/openjdk11/files/patch-make_autoconf_libraries.m4 ============================================================================== --- head/java/openjdk11/files/patch-make_autoconf_libraries.m4 Tue Aug 13 03:22:44 2019 (r508811) +++ head/java/openjdk11/files/patch-make_autoconf_libraries.m4 Tue Aug 13 04:41:40 2019 (r508812) @@ -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/openjdk11/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/openjdk11/files/patch-src_hotspot_os__cpu_bsd__x86_os__bsd__x86.cpp Tue Aug 13 04:41:40 2019 (r508812) @@ -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)) {