details: https://anonhg.NetBSD.org/pkgsrc/rev/abad78e94958
branches: trunk
changeset: 770384:abad78e94958
user: jperkin <jperkin%pkgsrc.org@localhost>
date: Tue Nov 30 09:39:11 2021 +0000
description:
mk: Remove LOWER_OS_VERSION.
OS_VERSION removes any non-numeric characters, so having a lowercase version
of it will always be identical. There's only a single package, a very old
version of gcc in wip, that references this variable so it should be safe to
just remove and avoid any potential confusion.
diffstat:
mk/bsd.prefs.mk | 10 ++++------
1 files changed, 4 insertions(+), 6 deletions(-)
diffs (52 lines):
diff -r cb09735b2708 -r abad78e94958 mk/bsd.prefs.mk
--- a/mk/bsd.prefs.mk Tue Nov 30 09:06:37 2021 +0000
+++ b/mk/bsd.prefs.mk Tue Nov 30 09:39:11 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.prefs.mk,v 1.414 2021/11/30 09:06:37 jperkin Exp $
+# $NetBSD: bsd.prefs.mk,v 1.415 2021/11/30 09:39:11 jperkin Exp $
#
# This file includes the mk.conf file, which contains the user settings.
#
@@ -172,7 +172,7 @@
.elif ${OPSYS} == "Darwin"
LOWER_OPSYS?= darwin
-LOWER_OPSYS_VERSUFFIX= ${LOWER_OS_VERSION:C/([0-9]*).*/\1/}
+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)}'
@@ -185,7 +185,7 @@
.elif ${OPSYS} == "FreeBSD"
OS_VERSION:= ${OS_VERSION:C/-.*$//}
LOWER_OPSYS?= freebsd
-LOWER_OPSYS_VERSUFFIX= ${LOWER_OS_VERSION:C/([0-9]*).*/\1/}
+LOWER_OPSYS_VERSUFFIX= ${OS_VERSION:C/([0-9]*).*/\1/}
. if ${MACHINE_ARCH} == "i386"
LOWER_VENDOR?= pc
. endif
@@ -201,7 +201,7 @@
LOWER_OPSYS?= interix
LOWER_VENDOR?= pc
. if exists(/usr/lib/libc.so.5.2) || exists(/usr/lib/x86/libc.so.5.2)
-LOWER_OPSYS_VERSUFFIX= ${LOWER_OS_VERSION:C/([0-9]*).*/\1/}
+LOWER_OPSYS_VERSUFFIX= ${OS_VERSION:C/([0-9]*).*/\1/}
. else
LOWER_OPSYS_VERSUFFIX?= 3
. if exists(/usr/lib/libc.so.3.5)
@@ -215,7 +215,6 @@
.elif ${OPSYS} == "MirBSD"
LOWER_OPSYS?= mirbsd
-LOWER_OS_VERSION= ${OS_VERSION}
LOWER_OPSYS_VERSUFFIX= ${OS_VERSION}
LOWER_VENDOR?= unknown
@@ -316,7 +315,6 @@
# Now commit the version values computed above, eliding the :sh
OS_VERSION:= ${OS_VERSION}
-LOWER_OS_VERSION:= ${OS_VERSION:tl}
MAKEFLAGS+= LOWER_OPSYS=${LOWER_OPSYS:Q}