svn commit: r523182 - in head/java: bootstrap-openjdk11 openjdk11 openjdk11/files
Piotr Kubaj
pkubaj at FreeBSD.org
Wed Jan 15 22:08:05 UTC 2020
Author: pkubaj
Date: Wed Jan 15 22:08:04 2020
New Revision: 523182
URL: https://svnweb.freebsd.org/changeset/ports/523182
Log:
java/openjdk11: add bootstrap and fix compilation for powerpc64 elfv2
Add bootstrap 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.
I assume here that GCC will be used exclusively on ELFv1 systems and Clang on ELFv2.
PR: 243182
Approved by: glewis (maintainer)
Added:
head/java/openjdk11/files/patch-make_autoconf_flags-cflags.m4 (contents, props changed)
Modified:
head/java/bootstrap-openjdk11/Makefile
head/java/bootstrap-openjdk11/distinfo
head/java/openjdk11/Makefile
Modified: head/java/bootstrap-openjdk11/Makefile
==============================================================================
--- head/java/bootstrap-openjdk11/Makefile Wed Jan 15 22:05:18 2020 (r523181)
+++ head/java/bootstrap-openjdk11/Makefile Wed Jan 15 22:08:04 2020 (r523182)
@@ -22,7 +22,8 @@ WRKSRC= ${WRKDIR}/${JDK_ROOT}
JDK_PORT= ${PKGNAMEPREFIX}${PORTNAME}
JDK_ROOT= ${PKGNAMEPREFIX}${PORTNAME}
-JDK_ARCH= ${ARCH}
+JDK_ARCH= ${ARCH}${JDK_ARCH_SUFFIX_${ARCH}}
+JDK_ARCH_SUFFIX_powerpc64= -${PPC_ABI:tl}
INSTALLDIR= ${STAGEDIR}${PREFIX}/${JDK_ROOT}
Modified: head/java/bootstrap-openjdk11/distinfo
==============================================================================
--- head/java/bootstrap-openjdk11/distinfo Wed Jan 15 22:05:18 2020 (r523181)
+++ head/java/bootstrap-openjdk11/distinfo Wed Jan 15 22:08:04 2020 (r523182)
@@ -5,5 +5,7 @@ SHA256 (bootstrap-openjdk11-amd64-11.0.5.10.1.tar.xz)
SIZE (bootstrap-openjdk11-amd64-11.0.5.10.1.tar.xz) = 103159648
SHA256 (bootstrap-openjdk11-i386-11.0.5.10.1.tar.xz) = 410b3bb719ae76770d14681c04d09420e1afbc0c463d9c33bfb94011cd90ecec
SIZE (bootstrap-openjdk11-i386-11.0.5.10.1.tar.xz) = 97797356
-SHA256 (bootstrap-openjdk11-powerpc64-11.0.5.10.1.tar.xz) = 84b41f06d42c745923227988bd0ab82f4f8adcfe88d65dfa8686a65474bacc6e
-SIZE (bootstrap-openjdk11-powerpc64-11.0.5.10.1.tar.xz) = 103414376
+SHA256 (bootstrap-openjdk11-powerpc64-elfv1-11.0.5.10.1.tar.xz) = 84b41f06d42c745923227988bd0ab82f4f8adcfe88d65dfa8686a65474bacc6e
+SIZE (bootstrap-openjdk11-powerpc64-elfv1-11.0.5.10.1.tar.xz) = 103414376
+SHA256 (bootstrap-openjdk11-powerpc64-elfv2-11.0.5.10.1.tar.xz) = b3bd1ac3fbfe6b4cefb14dd42d0f4f6c1646ed238b0cb2e757d20089d1cd7428
+SIZE (bootstrap-openjdk11-powerpc64-elfv2-11.0.5.10.1.tar.xz) = 97626680
Modified: head/java/openjdk11/Makefile
==============================================================================
--- head/java/openjdk11/Makefile Wed Jan 15 22:05:18 2020 (r523181)
+++ head/java/openjdk11/Makefile Wed Jan 15 22:08:04 2020 (r523182)
@@ -132,6 +132,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/openjdk11/files/patch-make_autoconf_flags-cflags.m4
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/java/openjdk11/files/patch-make_autoconf_flags-cflags.m4 Wed Jan 15 22:08:04 2020 (r523182)
@@ -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
More information about the svn-ports-all
mailing list