kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

prevent OPSYS_VERSION_CMD going wrong if minor or patch is >= 100

Browse source 
Clamp the version to 99 in that case, which is less wrong than expanding
the fixed-width field.
This commit is contained in:
tnn 2022-04-30 21:27:57 +00:00
parent 343c6f6635
commit 7c75cb3f99
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
mk/bsd.prefs.mk
View file

@ -1,4 +1,4 @@
# $NetBSD: bsd.prefs.mk,v 1.419 2022/04/24 17:55:55 gutteridge Exp $
# $NetBSD: bsd.prefs.mk,v 1.420 2022/04/30 21:27:57 tnn Exp $
#
# This file includes the mk.conf file, which contains the user settings.
#
@ -112,7 +112,7 @@ MAKEFLAGS+= OS_VERSION=${OS_VERSION:Q}
#
.if !defined(OPSYS_VERSION)
_OPSYS_VERSION_CMD= ${UNAME} -r | \
awk -F. '{printf "%02d%02d%02d", $$1, $$2, $$3}'
awk -F. '{major=int($$1); minor=int($$2); if (minor>=100) minor=99; patch=int($$3); if (patch>=100) patch=99; printf "%02d%02d%02d", major, minor, patch}'
OPSYS_VERSION= ${_OPSYS_VERSION_CMD:sh}
MAKEFLAGS+= OPSYS_VERSION=${OPSYS_VERSION:Q}
.endif
@ -186,7 +186,7 @@ LOWER_OPSYS?= darwin
LOWER_OPSYS_VERSUFFIX= ${OS_VERSION:C/([0-9]*).*/\1/}
LOWER_VENDOR?= apple
_OPSYS_VERSION_CMD= sw_vers -productVersion | \
awk -F. '{printf("%02d%02d%02d", $$1, $$2, $$3)}'
awk -F. '{major=int($$1); minor=int($$2); if (minor>=100) minor=99; patch=int($$3); if (patch>=100) patch=99; printf "%02d%02d%02d", major, minor, patch}'
.elif ${OPSYS} == "DragonFly"
OS_VERSION:= ${OS_VERSION:C/-.*$//}