Attachment 233411 Details for Bug 263483 – Fix

[patch] Fix

java.diff (text/plain), 1.26 KB, created by Ashish SHUKLA on 2022-04-23 04:09:53 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ashish SHUKLA

Created: 2022-04-23 04:09:53 UTC

Size: 1.26 KB

patch

obsolete

>From 78ecf0431e961388f6fe9e286f1f17decf8e7dc9 Mon Sep 17 00:00:00 2001
>From: Ashish SHUKLA <ashish@FreeBSD.org>
>Date: Sat, 23 Apr 2022 09:27:49 +0530
>Subject: [PATCH] Mk/bsd.java.mk: Fix JAVA_VERSION matching
>
>Anchor the matched patterns to be at the beginning of each word to
>prevent unexpected surprises
>
>e.g. with JAVA_VERSION= 17+ it results in _JAVA_VERSION set to
>unexpected "17 8 11 12 13 14 15 16 17 18", instead of "17 18"
>
>Reported by:    jrm
>---
> Mk/bsd.java.mk | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
>diff --git a/Mk/bsd.java.mk b/Mk/bsd.java.mk
>index f7eb3fe6192b..34f6522b295a 100644
>--- a/Mk/bsd.java.mk
>+++ b/Mk/bsd.java.mk
>@@ -285,7 +285,7 @@ JAVA_RUN=	jre
> .		undef _JAVA_PORTS_INSTALLED
> .		undef _JAVA_PORTS_POSSIBLE
> .		if defined(JAVA_VERSION)
>-_JAVA_VERSION=	${JAVA_VERSION:S/1.7+/1.7 1.8+/:S/1.8+/1.8 11+/:S/1.7/7/:S/1.8/8/:S/7+/7 8+/:S/8+/8 11+/:S/11+/11 12+/:S/12+/12 13+/:S/13+/13 14+/:S/14+/14 15+/:S/15+/15 16+/:S/16+/16 17+/:S/17+/17 18+/:S/18+/18/}
>+_JAVA_VERSION=	${JAVA_VERSION:S/^1.7+/1.7 1.8+/:S/^1.8+/1.8 11+/:S/^1.7/7/:S/^1.8/8/:S/^7+/7 8+/:S/^8+/8 11+/:S/^11+/11 12+/:S/^12+/12 13+/:S/^13+/13 14+/:S/^14+/14 15+/:S/^15+/15 16+/:S/^16+/16 17+/:S/^17+/17 18+/:S/^18+/18/}
> .		else
> _JAVA_VERSION=	${__JAVA_VERSION_LIST}
> .		endif
>-- 
>2.36.0
>

Actions: View | Diff

Attachments on bug 263483: 233411