From e38447ffb3d72ea81c80ee413797d52bd6fdfad1 Mon Sep 17 00:00:00 2001 From: tnn Date: Wed, 25 May 2022 20:00:56 +0000 Subject: [PATCH] openjdk{11,17}: match earmv[67]hf --- lang/openjdk11/bootstrap.mk | 4 ++-- lang/openjdk17/bootstrap.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lang/openjdk11/bootstrap.mk b/lang/openjdk11/bootstrap.mk index 1756682678ef..518654423826 100644 --- a/lang/openjdk11/bootstrap.mk +++ b/lang/openjdk11/bootstrap.mk @@ -1,4 +1,4 @@ -# $NetBSD: bootstrap.mk,v 1.7 2022/05/25 19:53:26 tnn Exp $ +# $NetBSD: bootstrap.mk,v 1.8 2022/05/25 20:00:56 tnn Exp $ .if ${OPSYS} == "NetBSD" && ${OPSYS_VERSION} < 080000 PKG_FAIL_REASON+= "Only supports NetBSD >= 8" @@ -35,7 +35,7 @@ EXTRACT_ONLY+= ${BOOT.nb9-aarch64} ONLY_FOR_PLATFORM+= NetBSD-*-earmv[67]hf BOOT.nb8-earmv6hf= bootstrap-jdk-1.11.0.15.10-netbsd-8-earmv6hf-20220525.tar.xz SITES.${BOOT.nb8-earmv6hf}= ${MASTER_SITE_LOCAL:=openjdk11/} -.if !empty(MACHINE_PLATFORM:MNetBSD-*-earmv6hf) || make(distinfo) +.if !empty(MACHINE_PLATFORM:MNetBSD-*-earmv[67]hf) || make(distinfo) DISTFILES+= ${BOOT.nb8-earmv6hf} EXTRACT_ONLY+= ${BOOT.nb8-earmv6hf} .endif diff --git a/lang/openjdk17/bootstrap.mk b/lang/openjdk17/bootstrap.mk index 38fa89131339..86fd8f5248f6 100644 --- a/lang/openjdk17/bootstrap.mk +++ b/lang/openjdk17/bootstrap.mk @@ -1,4 +1,4 @@ -# $NetBSD: bootstrap.mk,v 1.6 2022/05/25 19:41:49 tnn Exp $ +# $NetBSD: bootstrap.mk,v 1.7 2022/05/25 20:00:56 tnn Exp $ .if ${OPSYS} == "NetBSD" && ${OPSYS_VERSION} < 090000 PKG_FAIL_REASON+= "Only supports NetBSD >= 9" @@ -35,7 +35,7 @@ EXTRACT_ONLY+= ${BOOT.nb9-aarch64} ONLY_FOR_PLATFORM+= NetBSD-*-earmv[67]hf BOOT.nb9-earmv6hf= bootstrap-jdk-1.17.0.3.7-netbsd-9-earmv6hf-20220525.tar.xz SITES.${BOOT.nb9-earmv6hf}= ${MASTER_SITE_LOCAL:=openjdk17/} -.if !empty(MACHINE_PLATFORM:MNetBSD-*-earmv6hf) || make(distinfo) +.if !empty(MACHINE_PLATFORM:MNetBSD-*-earmv[67]hf) || make(distinfo) DISTFILES+= ${BOOT.nb9-earmv6hf} EXTRACT_ONLY+= ${BOOT.nb9-earmv6hf} .endif