pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/mk mk: Don't expand OPSYS_VERSION early.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/cb09735b2708
branches:  trunk
changeset: 770383:cb09735b2708
user:      jperkin <jperkin%pkgsrc.org@localhost>
date:      Tue Nov 30 09:06:37 2021 +0000

description:
mk: Don't expand OPSYS_VERSION early.

Something about NetBSD make(1), at least on 9_STABLE, doesn't like doing this,
resulting in literal "$$3" being passed to awk instead of being escaped down
to "$3".  The same construct works fine with pkgsrc bmake(1).

There doesn't appear to be any need to evaluate it inline anyway.

diffstat:

 mk/bsd.prefs.mk |  3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diffs (17 lines):

diff -r 4b9b57dcae3c -r cb09735b2708 mk/bsd.prefs.mk
--- a/mk/bsd.prefs.mk   Tue Nov 30 07:21:29 2021 +0000
+++ b/mk/bsd.prefs.mk   Tue Nov 30 09:06:37 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.prefs.mk,v 1.413 2021/11/29 16:14:23 jperkin Exp $
+# $NetBSD: bsd.prefs.mk,v 1.414 2021/11/30 09:06:37 jperkin Exp $
 #
 # This file includes the mk.conf file, which contains the user settings.
 #
@@ -316,7 +316,6 @@
 
 # Now commit the version values computed above, eliding the :sh
 OS_VERSION:=           ${OS_VERSION}
-OPSYS_VERSION:=                ${OPSYS_VERSION}
 LOWER_OS_VERSION:=     ${OS_VERSION:tl}
 
 MAKEFLAGS+=            LOWER_OPSYS=${LOWER_OPSYS:Q}



Home | Main Index | Thread Index | Old Index