From owner-svn-ports-head@freebsd.org Fri Sep 27 15:44:39 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 ECA7B126371; Fri, 27 Sep 2019 15:44:39 +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 46fx1g353pz3yFh; Fri, 27 Sep 2019 15:44:39 +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 4E15A1B17B; Fri, 27 Sep 2019 15:44:39 +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 x8RFid9f019505; Fri, 27 Sep 2019 15:44:39 GMT (envelope-from glewis@FreeBSD.org) Received: (from glewis@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x8RFidq9019504; Fri, 27 Sep 2019 15:44:39 GMT (envelope-from glewis@FreeBSD.org) Message-Id: <201909271544.x8RFidq9019504@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: glewis set sender to glewis@FreeBSD.org using -f From: Greg Lewis Date: Fri, 27 Sep 2019 15:44:39 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r513045 - in head/java: openjdk12 openjdk13 X-SVN-Group: ports-head X-SVN-Commit-Author: glewis X-SVN-Commit-Paths: in head/java: openjdk12 openjdk13 X-SVN-Commit-Revision: 513045 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: Fri, 27 Sep 2019 15:44:40 -0000 Author: glewis Date: Fri Sep 27 15:44:38 2019 New Revision: 513045 URL: https://svnweb.freebsd.org/changeset/ports/513045 Log: Sync with openjdk11 * Separate out platform/compiler concerns * Disable AoT on all arches except amd64 Sponsored by: The FreeBSD Foundation Modified: head/java/openjdk12/Makefile head/java/openjdk13/Makefile Modified: head/java/openjdk12/Makefile ============================================================================== --- head/java/openjdk12/Makefile Fri Sep 27 15:43:22 2019 (r513044) +++ head/java/openjdk12/Makefile Fri Sep 27 15:44:38 2019 (r513045) @@ -122,18 +122,19 @@ CONFIGURE_ARGS+= --with-toolchain-type=${COMPILER_TYPE .if ${COMPILER_TYPE} == gcc USE_GCC= yes -CONFIGURE_ARGS+= --disable-warnings-as-errors \ - --disable-dtrace \ - --with-extra-ldflags="-Wl,-rpath=${LOCALBASE}/lib/gcc${GCC_DEFAULT} -L/usr/local/lib/gcc${GCC_DEFAULT}" \ +CONFIGURE_ARGS+= --with-extra-ldflags="-Wl,-rpath=${LOCALBASE}/lib/gcc${GCC_DEFAULT} -L/usr/local/lib/gcc${GCC_DEFAULT}" \ --with-extra-cflags="-Wl,-rpath=${LOCALBASE}/lib/gcc${GCC_DEFAULT}" \ --with-extra-cxxflags="-Wl,-rpath=${LOCALBASE}/lib/gcc${GCC_DEFAULT}" .else MAKE_ENV+= USE_CLANG=true .endif -.if ${ARCH} == aarch64 +.if ${ARCH} == aarch64 || ${ARCH} == powerpc64 CONFIGURE_ARGS+= --disable-warnings-as-errors \ --disable-dtrace +.endif +.if ${ARCH} != amd64 +CONFIGURE_ARGS+= --enable-aot=no .endif .if empty(ICONV_LIB) Modified: head/java/openjdk13/Makefile ============================================================================== --- head/java/openjdk13/Makefile Fri Sep 27 15:43:22 2019 (r513044) +++ head/java/openjdk13/Makefile Fri Sep 27 15:44:38 2019 (r513045) @@ -120,18 +120,19 @@ CONFIGURE_ARGS+= --with-toolchain-type=${COMPILER_TYPE .if ${COMPILER_TYPE} == gcc USE_GCC= yes -CONFIGURE_ARGS+= --disable-warnings-as-errors \ - --disable-dtrace \ - --with-extra-ldflags="-Wl,-rpath=${LOCALBASE}/lib/gcc${GCC_DEFAULT} -L/usr/local/lib/gcc${GCC_DEFAULT}" \ +CONFIGURE_ARGS+= --with-extra-ldflags="-Wl,-rpath=${LOCALBASE}/lib/gcc${GCC_DEFAULT} -L/usr/local/lib/gcc${GCC_DEFAULT}" \ --with-extra-cflags="-Wl,-rpath=${LOCALBASE}/lib/gcc${GCC_DEFAULT}" \ --with-extra-cxxflags="-Wl,-rpath=${LOCALBASE}/lib/gcc${GCC_DEFAULT}" .else MAKE_ENV+= USE_CLANG=true .endif -.if ${ARCH} == aarch64 +.if ${ARCH} == aarch64 || ${ARCH} == powerpc64 CONFIGURE_ARGS+= --disable-warnings-as-errors \ --disable-dtrace +.endif +.if ${ARCH} != amd64 +CONFIGURE_ARGS+= --enable-aot=no .endif .if empty(ICONV_LIB)