Module Name: src
Committed By: mrg
Date: Sun Mar 10 11:04:08 UTC 2019
Modified Files:
src/distrib/sets: Makefile mkvars.mk sets.subr
Log Message:
convert make's HAVE_MESA_VER into mesa_ver for set lists
To generate a diff of this commit:
cvs rdiff -u -r1.106 -r1.107 src/distrib/sets/Makefile
cvs rdiff -u -r1.35 -r1.36 src/distrib/sets/mkvars.mk
cvs rdiff -u -r1.184 -r1.185 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/Makefile
diff -u src/distrib/sets/Makefile:1.106 src/distrib/sets/Makefile:1.107
--- src/distrib/sets/Makefile:1.106 Mon Oct 1 09:47:34 2018
+++ src/distrib/sets/Makefile Sun Mar 10 11:04:08 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.106 2018/10/01 09:47:34 martin Exp $
+# $NetBSD: Makefile,v 1.107 2019/03/10 11:04:08 mrg Exp $
# Experimental RCS METALOG versioning
# (Needs host's rcs(1) commands)
@@ -74,6 +74,9 @@ MAKETARSETS!= ${SETSCMD} ./makeflist -l
print_have_xorg_server_ver: .PHONY
@echo ${HAVE_XORG_SERVER_VER}
+print_have_mesa_ver: .PHONY
+ @echo ${HAVE_MESA_VER}
+
print_have_gcc: .PHONY
@echo ${HAVE_GCC}
Index: src/distrib/sets/mkvars.mk
diff -u src/distrib/sets/mkvars.mk:1.35 src/distrib/sets/mkvars.mk:1.36
--- src/distrib/sets/mkvars.mk:1.35 Thu May 31 05:27:45 2018
+++ src/distrib/sets/mkvars.mk Sun Mar 10 11:04:08 2019
@@ -1,4 +1,4 @@
-# $NetBSD: mkvars.mk,v 1.35 2018/05/31 05:27:45 mrg Exp $
+# $NetBSD: mkvars.mk,v 1.36 2019/03/10 11:04:08 mrg Exp $
MKEXTRAVARS= \
MACHINE \
@@ -7,6 +7,7 @@ MKEXTRAVARS= \
HAVE_GCC \
HAVE_GDB \
HAVE_XORG_SERVER_VER \
+ HAVE_MESA_VER \
HAVE_BINUTILS \
HAVE_LIBGCC_EH \
HAVE_OPENSSL \
Index: src/distrib/sets/sets.subr
diff -u src/distrib/sets/sets.subr:1.184 src/distrib/sets/sets.subr:1.185
--- src/distrib/sets/sets.subr:1.184 Thu Apr 12 11:49:04 2018
+++ src/distrib/sets/sets.subr Sun Mar 10 11:04:08 2019
@@ -1,4 +1,4 @@
-# $NetBSD: sets.subr,v 1.184 2018/04/12 11:49:04 nakayama Exp $
+# $NetBSD: sets.subr,v 1.185 2019/03/10 11:04:08 mrg Exp $
#
#
@@ -180,7 +180,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.184 2018/04/12 11:49:04 nakayama Exp $
+# # $NetBSD: sets.subr,v 1.185 2019/03/10 11:04:08 mrg Exp $
# . base-sys-root [keyword[,...]]
# ./altroot base-sys-root
# ./bin base-sys-root
@@ -215,6 +215,7 @@ SUBST="${SUBST};s#@MACHINE@#${MACHINE}#g
# gdb=<n> <n> = value of ${HAVE_GDB}
# openssl=<n> <n> = value of ${HAVE_OPENSSL}
# xorg_server_ver=<n> <n> = value of ${HAVE_XORG_SERVER_VER}
+# mesa_ver=<n> <n> = value of ${HAVE_MESA_VER}
#
# 2. The USE_<name>:
# use_inet6 ${USE_INET6} != no
@@ -310,6 +311,9 @@ list_set_files()
if ("xorg_server_ver" in wanted) {
wanted["xorg_server_ver=" "'"${HAVE_XORG_SERVER_VER}"'"] = 1
}
+ if ("mesa_ver" in wanted) {
+ wanted["mesa_ver=" "'"${HAVE_MESA_VER}"'"] = 1
+ }
if (("man" in wanted) && ("catpages" in wanted))
wanted[".cat"] = 1
if (("man" in wanted) && ("manpages" in wanted))
