diff options
| author | Piotr Kubaj <pkubaj@FreeBSD.org> | 2021-03-17 02:06:55 +0800 |
|---|---|---|
| committer | Piotr Kubaj <pkubaj@FreeBSD.org> | 2021-03-17 02:06:55 +0800 |
| commit | de4c16f87d84a70d49207d743fc6e2453c9a06a6 (patch) | |
| tree | 7cdc3a5f9803035c5b21d737c6d134bcfb8e4464 /java | |
| parent | 741c0bab7c73a589c8451c00cc7a44630e9a574f (diff) | |
| download | freebsd-ports-gnome-de4c16f87d84a70d49207d743fc6e2453c9a06a6.tar.gz freebsd-ports-gnome-de4c16f87d84a70d49207d743fc6e2453c9a06a6.tar.zst freebsd-ports-gnome-de4c16f87d84a70d49207d743fc6e2453c9a06a6.zip | |
java/openjdk15: fix build on powerpc64le
Also cosmetic fixes related to powerpc64* for openjdk 12, 13, 14.
Diffstat (limited to 'java')
| -rw-r--r-- | java/openjdk12/Makefile | 2 | ||||
| -rw-r--r-- | java/openjdk13/Makefile | 2 | ||||
| -rw-r--r-- | java/openjdk14/Makefile | 2 | ||||
| -rw-r--r-- | java/openjdk15/Makefile | 10 |
4 files changed, 9 insertions, 7 deletions
diff --git a/java/openjdk12/Makefile b/java/openjdk12/Makefile index 3891b4fb00c7..c56a6b8b5ca3 100644 --- a/java/openjdk12/Makefile +++ b/java/openjdk12/Makefile @@ -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 diff --git a/java/openjdk13/Makefile b/java/openjdk13/Makefile index 3b7aad7beff7..bf4f1ef27834 100644 --- a/java/openjdk13/Makefile +++ b/java/openjdk13/Makefile @@ -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 diff --git a/java/openjdk14/Makefile b/java/openjdk14/Makefile index 0d2a5b9873fa..67a6063945b4 100644 --- a/java/openjdk14/Makefile +++ b/java/openjdk14/Makefile @@ -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 diff --git a/java/openjdk15/Makefile b/java/openjdk15/Makefile index 4c3bcd82767e..7d93c091531a 100644 --- a/java/openjdk15/Makefile +++ b/java/openjdk15/Makefile @@ -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=${LOCALBASE}/lib/gcc${GCC_DEFA 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 |