Module Name: src
Committed By: nakayama
Date: Mon Jan 28 13:46:47 UTC 2013
Modified Files:
src/distrib/sets: mkvars.mk sets.subr
Log Message:
Follow the change from HAS_SSP to HAVE_SSP.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/distrib/sets/mkvars.mk
cvs rdiff -u -r1.142 -r1.143 src/distrib/sets/sets.subr
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/mkvars.mk
diff -u src/distrib/sets/mkvars.mk:1.7 src/distrib/sets/mkvars.mk:1.8
--- src/distrib/sets/mkvars.mk:1.7 Mon Nov 5 00:57:39 2012
+++ src/distrib/sets/mkvars.mk Mon Jan 28 13:46:47 2013
@@ -1,4 +1,4 @@
-# $NetBSD: mkvars.mk,v 1.7 2012/11/05 00:57:39 alnsn Exp $
+# $NetBSD: mkvars.mk,v 1.8 2013/01/28 13:46:47 nakayama Exp $
MKEXTRAVARS= \
MACHINE \
@@ -6,7 +6,7 @@ MKEXTRAVARS= \
MACHINE_CPU \
HAVE_GCC \
HAVE_GDB \
- HAS_SSP \
+ HAVE_SSP \
OBJECT_FMT \
TOOLCHAIN_MISSING \
EXTSRCS \
Index: src/distrib/sets/sets.subr
diff -u src/distrib/sets/sets.subr:1.142 src/distrib/sets/sets.subr:1.143
--- src/distrib/sets/sets.subr:1.142 Wed Jan 16 21:11:05 2013
+++ src/distrib/sets/sets.subr Mon Jan 28 13:46:47 2013
@@ -1,4 +1,4 @@
-# $NetBSD: sets.subr,v 1.142 2013/01/16 21:11:05 christos Exp $
+# $NetBSD: sets.subr,v 1.143 2013/01/28 13:46:47 nakayama Exp $
#
#
@@ -19,7 +19,7 @@
# HAVE_BINUTILS
# HAVE_GCC
# HAVE_GDB
-# HAS_SSP
+# HAVE_SSP
# TOOLCHAIN_MISSING
# OBJECT_FMT
# as well as:
@@ -179,7 +179,7 @@ SUBST="${SUBST};s#@MACHINE@#${MACHINE}#g
# In each file, a record consists of a path and a System Package name,
# separated by whitespace. E.g.,
#
-# # $NetBSD: sets.subr,v 1.142 2013/01/16 21:11:05 christos Exp $
+# # $NetBSD: sets.subr,v 1.143 2013/01/28 13:46:47 nakayama Exp $
# . base-sys-root [keyword[,...]]
# ./altroot base-sys-root
# ./bin base-sys-root
@@ -248,7 +248,7 @@ SUBST="${SUBST};s#@MACHINE@#${MACHINE}#g
# skey ${MKSKEY} != no
# sljit ${MKSLJIT} != no
# solaris ${MKDTRACE} != no or ${MKZFS} != no
-# ssp ${HAS_SSP} != no
+# ssp ${HAVE_SSP} != no
# tpm ${MKTPM} != no
# x11 ${MKX11} != no && ${X11FLAVOUR} != "Xorg"
# xorg ${MKX11} != no && ${X11FLAVOUR} == "Xorg"
@@ -287,7 +287,7 @@ list_set_files()
nv = needvars[vi]
kw = tolower(nv)
sub(/^mk/, "", kw)
- sub(/^has_/, "", kw)
+ sub(/^have_/, "", kw)
if (ENVIRON[nv] != "no")
wanted[kw] = 1
}
