svn commit: r568594 - in head/java: openjdk12 openjdk13 openjdk14 openjdk15

[Piotr Kubaj]

Author: pkubaj
Date: Tue Mar 16 18:06:55 2021
New Revision: 568594
URL: https://svnweb.freebsd.org/changeset/ports/568594

Log:
  java/openjdk15: fix build on powerpc64le
  
  Also cosmetic fixes related to powerpc64* for openjdk 12, 13, 14.

Modified:
  head/java/openjdk12/Makefile
  head/java/openjdk13/Makefile
  head/java/openjdk14/Makefile
  head/java/openjdk15/Makefile

Modified: head/java/openjdk12/Makefile
==============================================================================
--- head/java/openjdk12/Makefile	Tue Mar 16 17:53:02 2021	(r568593)
+++ head/java/openjdk12/Makefile	Tue Mar 16 18:06:55 2021	(r568594)
@@ -144,7 +144,7 @@ CONFIGURE_ARGS+=	--disable-warnings-as-errors
 .if ${ARCH} == aarch64 || ${ARCH} == powerpc64
 CONFIGURE_ARGS+=	--disable-dtrace
 .endif
-.if defined(PPC_ABI) && ${PPC_ABI} == ELFv2 || ${ARCH} == powerpc64le
+.if (defined(PPC_ABI) && ${PPC_ABI} == ELFv2) || ${ARCH} == powerpc64le
 CONFIGURE_ARGS+=	--disable-precompiled-headers
 .endif
 .if ${ARCH} != amd64

Modified: head/java/openjdk13/Makefile
==============================================================================
--- head/java/openjdk13/Makefile	Tue Mar 16 17:53:02 2021	(r568593)
+++ head/java/openjdk13/Makefile	Tue Mar 16 18:06:55 2021	(r568594)
@@ -142,7 +142,7 @@ CONFIGURE_ARGS+=	--disable-warnings-as-errors
 .if ${ARCH} == aarch64 || ${ARCH} == powerpc64
 CONFIGURE_ARGS+=	--disable-dtrace
 .endif
-.if defined(PPC_ABI) && ${PPC_ABI} == ELFv2 || ${ARCH} == powerpc64le
+.if (defined(PPC_ABI) && ${PPC_ABI} == ELFv2) || ${ARCH} == powerpc64le
 CONFIGURE_ARGS+=	--disable-precompiled-headers
 .endif
 .if ${ARCH} != amd64

Modified: head/java/openjdk14/Makefile
==============================================================================
--- head/java/openjdk14/Makefile	Tue Mar 16 17:53:02 2021	(r568593)
+++ head/java/openjdk14/Makefile	Tue Mar 16 18:06:55 2021	(r568594)
@@ -144,7 +144,7 @@ CONFIGURE_ARGS+=	--disable-warnings-as-errors
 .if ${ARCH} == aarch64 || ${ARCH} == powerpc64
 CONFIGURE_ARGS+=	--disable-dtrace
 .endif
-.if defined(PPC_ABI) && ${PPC_ABI} == ELFv2 || ${ARCH} == powerpc64le
+.if (defined(PPC_ABI) && ${PPC_ABI} == ELFv2) || ${ARCH} == powerpc64le
 CONFIGURE_ARGS+=	--disable-precompiled-headers
 .endif
 .if ${ARCH} != amd64

Modified: head/java/openjdk15/Makefile
==============================================================================
--- head/java/openjdk15/Makefile	Tue Mar 16 17:53:02 2021	(r568593)
+++ head/java/openjdk15/Makefile	Tue Mar 16 18:06:55 2021	(r568594)
@@ -11,7 +11,7 @@ COMMENT=	Java Development Kit ${JDK_MAJOR_VERSION}
 
 LICENSE=	GPLv2
 
-ONLY_FOR_ARCHS=	amd64 i386 powerpc64
+ONLY_FOR_ARCHS=	amd64 i386 powerpc64 powerpc64le
 
 BUILD_DEPENDS=	zip:archivers/zip \
 		autoconf>0:devel/autoconf \
@@ -137,11 +137,13 @@ CONFIGURE_ARGS+=	--with-extra-ldflags="-Wl,-rpath=${LO
 MAKE_ENV+=	USE_CLANG=true
 .endif
 
+.if ${ARCH} == aarch64 || ${ARCH:Mpowerpc64*}
+CONFIGURE_ARGS+=	--disable-warnings-as-errors
+.endif
 .if ${ARCH} == aarch64 || ${ARCH} == powerpc64
-CONFIGURE_ARGS+=	--disable-warnings-as-errors \
-			--disable-dtrace
+CONFIGURE_ARGS+=	--disable-dtrace
 .endif
-.if defined(PPC_ABI) && ${PPC_ABI} == ELFv2
+.if (defined(PPC_ABI) && ${PPC_ABI} == ELFv2) || ${ARCH} == powerpc64le
 CONFIGURE_ARGS+=	--disable-precompiled-headers
 .endif
 .if ${ARCH} != amd64