From owner-svn-ports-all@freebsd.org Thu Jan 16 13:59:09 2020 Return-Path: Delivered-To: svn-ports-all@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 EEB4D237FC5; Thu, 16 Jan 2020 13:59:09 +0000 (UTC) (envelope-from pkubaj@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 47z5Qj63N5z423m; Thu, 16 Jan 2020 13:59:09 +0000 (UTC) (envelope-from pkubaj@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 CB0F320658; Thu, 16 Jan 2020 13:59:09 +0000 (UTC) (envelope-from pkubaj@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 00GDx9qi066165; Thu, 16 Jan 2020 13:59:09 GMT (envelope-from pkubaj@FreeBSD.org) Received: (from pkubaj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 00GDx9fH066163; Thu, 16 Jan 2020 13:59:09 GMT (envelope-from pkubaj@FreeBSD.org) Message-Id: <202001161359.00GDx9fH066163@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pkubaj set sender to pkubaj@FreeBSD.org using -f From: Piotr Kubaj Date: Thu, 16 Jan 2020 13:59:09 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r523232 - in head/java/openjdk12: . files X-SVN-Group: ports-head X-SVN-Commit-Author: pkubaj X-SVN-Commit-Paths: in head/java/openjdk12: . files X-SVN-Commit-Revision: 523232 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 16 Jan 2020 13:59:10 -0000 Author: pkubaj Date: Thu Jan 16 13:59:09 2020 New Revision: 523232 URL: https://svnweb.freebsd.org/changeset/ports/523232 Log: java/openjdk12: correctly patch openjdk12 for ppc64 elfv2 The previous patch didn't check for architecture. PR: 243183 Added: head/java/openjdk12/files/patch-make_autoconf_flags-cflags.m4 (contents, props changed) Modified: head/java/openjdk12/Makefile Modified: head/java/openjdk12/Makefile ============================================================================== --- head/java/openjdk12/Makefile Thu Jan 16 13:52:16 2020 (r523231) +++ head/java/openjdk12/Makefile Thu Jan 16 13:59:09 2020 (r523232) @@ -134,6 +134,9 @@ MAKE_ENV+= USE_CLANG=true CONFIGURE_ARGS+= --disable-warnings-as-errors \ --disable-dtrace .endif +.if defined(PPC_ABI) && ${PPC_ABI} == ELFv2 +CONFIGURE_ARGS+= --disable-precompiled-headers +.endif .if ${ARCH} != amd64 CONFIGURE_ARGS+= --enable-aot=no .endif Added: head/java/openjdk12/files/patch-make_autoconf_flags-cflags.m4 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/java/openjdk12/files/patch-make_autoconf_flags-cflags.m4 Thu Jan 16 13:59:09 2020 (r523232) @@ -0,0 +1,13 @@ +--- make/autoconf/flags-cflags.m4.orig 2020-01-08 09:12:31 UTC ++++ make/autoconf/flags-cflags.m4 +@@ -770,6 +770,10 @@ AC_DEFUN([FLAGS_SETUP_CFLAGS_CPU_DEP], + # for all archs except arm and ppc, prevent gcc to omit frame pointer + $1_CFLAGS_CPU_JDK="${$1_CFLAGS_CPU_JDK} -fno-omit-frame-pointer" + fi ++ elif test "x$OPENJDK_TARGET_OS_ENV" = xbsd.freebsd; then ++ if test "x$FLAGS_CPU" = xppc64; then ++ $1_CFLAGS_CPU_JVM="${$1_CFLAGS_CPU_JVM} -DABI_ELFv2 -mcpu=powerpc64 -mtune=power5" ++ fi + fi + + elif test "x$TOOLCHAIN_TYPE" = xsolstudio; then