From owner-svn-ports-all@freebsd.org Tue Mar 16 18:06:57 2021 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 382235B7B92; Tue, 16 Mar 2021 18:06:57 +0000 (UTC) (envelope-from pkubaj@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4F0LpT145Tz4vhs; Tue, 16 Mar 2021 18:06:57 +0000 (UTC) (envelope-from pkubaj@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 1794A27F71; Tue, 16 Mar 2021 18:06:57 +0000 (UTC) (envelope-from pkubaj@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 12GI6u2c048279; Tue, 16 Mar 2021 18:06:56 GMT (envelope-from pkubaj@FreeBSD.org) Received: (from pkubaj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 12GI6uxm048275; Tue, 16 Mar 2021 18:06:56 GMT (envelope-from pkubaj@FreeBSD.org) Message-Id: <202103161806.12GI6uxm048275@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pkubaj set sender to pkubaj@FreeBSD.org using -f From: Piotr Kubaj Date: Tue, 16 Mar 2021 18:06:56 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r568594 - in head/java: openjdk12 openjdk13 openjdk14 openjdk15 X-SVN-Group: ports-head X-SVN-Commit-Author: pkubaj X-SVN-Commit-Paths: in head/java: openjdk12 openjdk13 openjdk14 openjdk15 X-SVN-Commit-Revision: 568594 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 16 Mar 2021 18:06:57 -0000 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