svn commit: r523232 - in head/java/openjdk12: . files

[Piotr Kubaj]

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