Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 16 Jan 2020 09:29:00 +0000 (UTC)
From:      Piotr Kubaj <pkubaj@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r523218 - in head/java/openjdk12: . files
Message-ID:  <202001160929.00G9T033003673@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: pkubaj
Date: Thu Jan 16 09:29:00 2020
New Revision: 523218
URL: https://svnweb.freebsd.org/changeset/ports/523218

Log:
  java/openjdk12: fix compilation for powerpc64 elfv2
  
  Because of issue with macros in precompiled.hpp, --disable-precompiled-headers is necessary.
  
  Since openjdk compiles for elfv1 by default on big-endian ppc64, use a patch to compile for elfv2.
  
  PR:		243183
  Approved by:	glewis (maintainer)

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 09:23:33 2020	(r523217)
+++ head/java/openjdk12/Makefile	Thu Jan 16 09:29:00 2020	(r523218)
@@ -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 09:29:00 2020	(r523218)
@@ -0,0 +1,11 @@
+--- make/autoconf/flags-cflags.m4.orig	2020-01-08 09:12:31 UTC
++++ make/autoconf/flags-cflags.m4
+@@ -770,6 +770,8 @@ 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
++        $1_CFLAGS_CPU_JVM="${$1_CFLAGS_CPU_JVM} -DABI_ELFv2 -mcpu=powerpc64 -mtune=power5"
+     fi
+ 
+   elif test "x$TOOLCHAIN_TYPE" = xsolstudio; then



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202001160929.00G9T033003673>