From owner-dev-commits-ports-main@freebsd.org Tue May 18 15:59:43 2021 Return-Path: Delivered-To: dev-commits-ports-main@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 57372650E06; Tue, 18 May 2021 15:59:43 +0000 (UTC) (envelope-from git@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 4Fl10b1xCtz4sWv; Tue, 18 May 2021 15:59:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 2B148221DF; Tue, 18 May 2021 15:59:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 14IFxhOB042991; Tue, 18 May 2021 15:59:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 14IFxh7e042990; Tue, 18 May 2021 15:59:43 GMT (envelope-from git) Date: Tue, 18 May 2021 15:59:43 GMT Message-Id: <202105181559.14IFxh7e042990@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Mikael Urankar Subject: git: 362eb92da221 - main - java/openjdk11: Add armv6 / armv7 support MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mikael X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 362eb92da22191ba1aa95524f86a62afc9d92496 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the main branch of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 18 May 2021 15:59:43 -0000 The branch main has been updated by mikael: URL: https://cgit.FreeBSD.org/ports/commit/?id=362eb92da22191ba1aa95524f86a62afc9d92496 commit 362eb92da22191ba1aa95524f86a62afc9d92496 Author: Mikael Urankar AuthorDate: 2021-05-18 15:57:36 +0000 Commit: Mikael Urankar CommitDate: 2021-05-18 15:57:36 +0000 java/openjdk11: Add armv6 / armv7 support PR: 255662 Approved by: portmgr (tier 2 blanket) --- java/bootstrap-openjdk11/Makefile | 8 ++++---- java/bootstrap-openjdk11/distinfo | 2 ++ java/openjdk11/Makefile | 10 +++++----- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/java/bootstrap-openjdk11/Makefile b/java/bootstrap-openjdk11/Makefile index 3b50f7190214..c904d7fa27c0 100644 --- a/java/bootstrap-openjdk11/Makefile +++ b/java/bootstrap-openjdk11/Makefile @@ -21,19 +21,19 @@ WRKSRC= ${WRKDIR}/${JDK_ROOT} JDK_PORT= ${PKGNAMEPREFIX}${PORTNAME} JDK_ROOT= ${PKGNAMEPREFIX}${PORTNAME} -JDK_ARCH= ${ARCH}${JDK_ARCH_SUFFIX_${ARCH}} +JDK_ARCH= ${ARCH:C/armv.*/arm/}${JDK_ARCH_SUFFIX_${ARCH}} JDK_ARCH_SUFFIX_powerpc64= -${PPC_ABI:tl} INSTALLDIR= ${STAGEDIR}${PREFIX}/${JDK_ROOT} .include -# Support aarch64 on FreeBSD 12 and up +# Support aarch64, armv6 and armv7 on FreeBSD 12 and up .if ${OSVERSION} >= 1200500 -ONLY_FOR_ARCHS+=aarch64 +ONLY_FOR_ARCHS+=aarch64 armv6 armv7 .endif -.if ${ARCH} == aarch64 +.if ${ARCH} == aarch64 || ${ARCH:Marmv*} DISTNAME= ${JDK_PORT}-${JDK_ARCH}-12-${PORTVERSION} PLIST_SUB+= PPC64LE="" .elif ${ARCH} == powerpc64le diff --git a/java/bootstrap-openjdk11/distinfo b/java/bootstrap-openjdk11/distinfo index 9a6aa96df4e4..8240dbce9ee1 100644 --- a/java/bootstrap-openjdk11/distinfo +++ b/java/bootstrap-openjdk11/distinfo @@ -3,6 +3,8 @@ SHA256 (bootstrap-openjdk11-aarch64-12-11.0.5.10.1.tar.xz) = 37a9a9761f2f29c98cc SIZE (bootstrap-openjdk11-aarch64-12-11.0.5.10.1.tar.xz) = 97125784 SHA256 (bootstrap-openjdk11-amd64-11.0.5.10.1.tar.xz) = c2412b483d186d6fb430163f2485c0d6ad0183b0b8de3f08464f65d1c9bf4325 SIZE (bootstrap-openjdk11-amd64-11.0.5.10.1.tar.xz) = 103159648 +SHA256 (bootstrap-openjdk11-arm-12-11.0.5.10.1.tar.xz) = 685aef29217a2e912d707087973a996f98cc4dc48b008a43892f7f16933002bc +SIZE (bootstrap-openjdk11-arm-12-11.0.5.10.1.tar.xz) = 97825032 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-elfv1-11.0.5.10.1.tar.xz) = 84b41f06d42c745923227988bd0ab82f4f8adcfe88d65dfa8686a65474bacc6e diff --git a/java/openjdk11/Makefile b/java/openjdk11/Makefile index 1799650f32f7..f8ac0c8a8896 100644 --- a/java/openjdk11/Makefile +++ b/java/openjdk11/Makefile @@ -45,7 +45,7 @@ MAKE_ENV= LANG="C" \ CPP=${CPP} \ MAKEFLAGS="" -JDK_OSARCH= bsd-${ARCH:S/amd64/x86_64/:S/i386/x86/:S/powerpc64/ppc64/} +JDK_OSARCH= bsd-${ARCH:S/amd64/x86_64/:C/armv.*/arm/:S/i386/x86/:S/powerpc64/ppc64/} JDK_BUILDDIR= ${WRKSRC}/build/${JDK_OSARCH}-normal-${JDK_BUILD_JVM}-${JDK_BUILD_TYPE} .if defined(BUILD_JRE) JDK_IMAGEDIR= ${JDK_BUILDDIR}/images/jre @@ -109,9 +109,9 @@ JDK_BUILD_TYPE= release .include -# Support aarch64 on FreeBSD 12 and up +# Support aarch64, armv6 and armv7 on FreeBSD 12 and up .if ${OSVERSION} >= 1200500 -ONLY_FOR_ARCHS+=aarch64 +ONLY_FOR_ARCHS+=aarch64 armv6 armv7 .endif BOOTSTRAP_JDKS= ${LOCALBASE}/openjdk11 \ @@ -144,10 +144,10 @@ CONFIGURE_ARGS+= --with-extra-ldflags="-Wl,-rpath=${LOCALBASE}/lib/gcc${GCC_DEFA MAKE_ENV+= USE_CLANG=true .endif -.if ${ARCH} == aarch64 || ${ARCH:Mpowerpc64*} +.if ${ARCH} == aarch64 || ${ARCH:Marmv*} || ${ARCH:Mpowerpc64*} CONFIGURE_ARGS+= --disable-warnings-as-errors .endif -.if ${ARCH} == aarch64 || (defined(PPC_ABI) && ${PPC_ABI} == ELFv1) +.if ${ARCH} == aarch64 || ${ARCH:Marmv*} || (defined(PPC_ABI) && ${PPC_ABI} == ELFv1) CONFIGURE_ARGS+= --disable-dtrace .endif .if (defined(PPC_ABI) && ${PPC_ABI} == ELFv2) || ${ARCH} == powerpc64le