git: 670c3c8cd9bd - main - java/openjdk17: port to powerpc64le

[Piotr Kubaj]

The branch main has been updated by pkubaj:

URL: https://cgit.FreeBSD.org/ports/commit/?id=670c3c8cd9bde6a4ebc7d79a0087e98f0e3446b9

commit 670c3c8cd9bde6a4ebc7d79a0087e98f0e3446b9
Author:     Piotr Kubaj <pkubaj at FreeBSD.org>
AuthorDate: 2021-09-29 21:55:53 +0000
Commit:     Piotr Kubaj <pkubaj at FreeBSD.org>
CommitDate: 2021-09-29 21:55:53 +0000

    java/openjdk17: port to powerpc64le
---
 java/openjdk17/Makefile                                   |  8 +++++---
 java/openjdk17/files/patch-src_hotspot_os_bsd_os__bsd.cpp | 12 ++++++++++--
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/java/openjdk17/Makefile b/java/openjdk17/Makefile
index 63d9feb890a4..f57b78326bf0 100644
--- a/java/openjdk17/Makefile
+++ b/java/openjdk17/Makefile
@@ -9,7 +9,7 @@ COMMENT=	Java Development Kit ${JDK_MAJOR_VERSION}
 
 LICENSE=	GPLv2
 
-ONLY_FOR_ARCHS=	amd64 aarch64
+ONLY_FOR_ARCHS=	amd64 aarch64 powerpc64le
 
 BUILD_DEPENDS=	zip:archivers/zip \
 		autoconf>0:devel/autoconf \
@@ -140,10 +140,10 @@ CONFIGURE_ARGS+=	--disable-warnings-as-errors
 .if ${ARCH} == aarch64 || (defined(PPC_ABI) && ${PPC_ABI} == ELFv1)
 CONFIGURE_ARGS+=	--disable-dtrace
 .endif
-.if (defined(PPC_ABI) && ${PPC_ABI} == ELFv2) || ${ARCH} == powerpc64le
+.if (defined(PPC_ABI) && ${PPC_ABI} == ELFv2)
 CONFIGURE_ARGS+=	--disable-precompiled-headers
 .endif
-.if ${ARCH} != amd64
+.if ${ARCH} != amd64 && ${ARCH} != powerpc64le
 CONFIGURE_ARGS+=	--enable-aot=no
 .endif
 .if ${ARCH} == powerpc64 && ${OSREL:C/\.[0-9]//} == 12
@@ -168,6 +168,8 @@ post-patch:
 		-e 's|%%ICONV_LDFLAGS%%|${ICONV_LDFLAGS}|' \
 		-e 's|%%ICONV_LIBS%%|${ICONV_LIBS}|' \
 		${WRKSRC}/make/autoconf/libraries.m4
+	${MV} ${WRKSRC}/src/hotspot/os_cpu/bsd_ppc/bytes_bsd_ppc.inline.hpp \
+		${WRKSRC}/src/hotspot/os_cpu/bsd_ppc/bytes_bsd_ppc.hpp
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${INSTALLDIR}
diff --git a/java/openjdk17/files/patch-src_hotspot_os_bsd_os__bsd.cpp b/java/openjdk17/files/patch-src_hotspot_os_bsd_os__bsd.cpp
index 8be2abe3388f..870868e7690e 100644
--- a/java/openjdk17/files/patch-src_hotspot_os_bsd_os__bsd.cpp
+++ b/java/openjdk17/files/patch-src_hotspot_os_bsd_os__bsd.cpp
@@ -1,5 +1,13 @@
---- src/hotspot/os/bsd/os_bsd.cpp.orig	2019-03-28 21:47:08.000000000 -0700
-+++ src/hotspot/os/bsd/os_bsd.cpp	2019-03-28 23:08:55.590922000 -0700
+--- src/hotspot/os/bsd/os_bsd.cpp.orig	2021-09-29 21:25:10 UTC
++++ src/hotspot/os/bsd/os_bsd.cpp
+@@ -58,6 +58,7 @@
+ #include "runtime/thread.inline.hpp"
+ #include "runtime/threadCritical.hpp"
+ #include "runtime/timer.hpp"
++#include "runtime/vm_version.hpp"
+ #include "services/attachListener.hpp"
+ #include "services/memTracker.hpp"
+ #include "services/runtimeService.hpp"
 @@ -361,7 +361,7 @@
      #elif defined(__NetBSD__)
        #define DEFAULT_LIBPATH "/usr/lib:/usr/pkg/lib"