[src/trunk]: src Move the test for evbppc out of sets.subr and into bsd.own.m...

[he <he%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/c1118546392d
branches:  trunk
changeset: 749860:c1118546392d
user:      he <he%NetBSD.org@localhost>
date:      Fri Dec 11 15:22:33 2009 +0000

description:
Move the test for evbppc out of sets.subr and into bsd.own.mk, to
decide whether to make kernel modules: set MKKMOD to no for evbppc.
Use this in etc/Makefile to decide whether to do the "modules"
obsolete sets.  Move the ./var/db/obsolete/modules entry from the
"mi" to the "module.mi" file set.

Fixes the build for evbppc.

Discussed with uebayasi@

diffstat:

 distrib/sets/lists/base/mi        |  3 +--
 distrib/sets/lists/base/module.mi |  2 ++
 distrib/sets/sets.subr            |  6 ++----
 etc/Makefile                      |  7 +++++--
 share/mk/bsd.own.mk               |  9 ++++++++-
 5 files changed, 18 insertions(+), 9 deletions(-)

diffs (94 lines):

diff -r 5ba79673d722 -r c1118546392d distrib/sets/lists/base/mi
--- a/distrib/sets/lists/base/mi        Fri Dec 11 13:56:15 2009 +0000
+++ b/distrib/sets/lists/base/mi        Fri Dec 11 15:22:33 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.847 2009/12/05 20:11:01 pooka Exp $
+# $NetBSD: mi,v 1.848 2009/12/11 15:22:33 he Exp $
 #
 # Note:        Don't delete entries from here - mark them as "obsolete" instead,
 #      unless otherwise stated below.
@@ -4701,7 +4701,6 @@
 ./var/db/obsolete/games                                base-sys-root
 ./var/db/obsolete/man                          base-sys-root
 ./var/db/obsolete/misc                         base-sys-root
-./var/db/obsolete/modules                      base-sys-root
 ./var/db/obsolete/tests                                base-sys-root
 ./var/db/obsolete/text                         base-sys-root
 ./var/db/postfix                               base-postfix-root
diff -r 5ba79673d722 -r c1118546392d distrib/sets/lists/base/module.mi
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/distrib/sets/lists/base/module.mi Fri Dec 11 15:22:33 2009 +0000
@@ -0,0 +1,2 @@
+# $NetBSD: module.mi,v 1.13 2009/12/11 15:22:33 he Exp $
+./var/db/obsolete/modules                      base-sys-root
diff -r 5ba79673d722 -r c1118546392d distrib/sets/sets.subr
--- a/distrib/sets/sets.subr    Fri Dec 11 13:56:15 2009 +0000
+++ b/distrib/sets/sets.subr    Fri Dec 11 15:22:33 2009 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: sets.subr,v 1.113 2009/12/11 13:30:11 uebayasi Exp $
+#      $NetBSD: sets.subr,v 1.114 2009/12/11 15:22:33 he Exp $
 #
 
 #
@@ -140,8 +140,6 @@
 module=yes
 if [ "${MKKMOD}" = "no" ]; then
        module=no                       # MODULEs are off.
-elif [ "${MACHINE}" = "evbppc" ]; then
-       module=no                       # Turn off MODULEs for some ports.
 fi
 # Determine lib type. Do this first so stlib also gets set.
 if [ "${OBJECT_FMT}" = "ELF" ]; then
@@ -178,7 +176,7 @@
 # In each file, a record consists of a path and a System Package name,
 # separated by whitespace. E.g.,
 #
-#      # $NetBSD: sets.subr,v 1.113 2009/12/11 13:30:11 uebayasi Exp $
+#      # $NetBSD: sets.subr,v 1.114 2009/12/11 15:22:33 he Exp $
 #      .                       base-sys-root   [keyword[,...]]
 #      ./altroot               base-sys-root
 #      ./bin                   base-sys-root
diff -r 5ba79673d722 -r c1118546392d etc/Makefile
--- a/etc/Makefile      Fri Dec 11 13:56:15 2009 +0000
+++ b/etc/Makefile      Fri Dec 11 15:22:33 2009 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.375 2009/12/05 19:14:39 pooka Exp $
+#      $NetBSD: Makefile,v 1.376 2009/12/11 15:22:33 he Exp $
 #      from: @(#)Makefile      8.7 (Berkeley) 5/25/95
 
 # Environment variables without default values:
@@ -364,7 +364,10 @@
 #      Install var/db/obsolete set lists; this is performed by "make build"
 #
 OBSOLETE.dir=          ${.OBJDIR}/obsolete.dir
-OBSOLETE.files=                base comp etc games man misc modules tests text
+OBSOLETE.files=                base comp etc games man misc tests text
+.if ${MKKMOD} != "no"
+OBSOLETE.files+=       modules
+.endif
 .if ${MKX11} != "no"
 OBSOLETE.files+=       xbase xcomp xetc xfont xserver
 .endif
diff -r 5ba79673d722 -r c1118546392d share/mk/bsd.own.mk
--- a/share/mk/bsd.own.mk       Fri Dec 11 13:56:15 2009 +0000
+++ b/share/mk/bsd.own.mk       Fri Dec 11 15:22:33 2009 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.own.mk,v 1.605 2009/12/11 08:52:37 uebayasi Exp $
+#      $NetBSD: bsd.own.mk,v 1.606 2009/12/11 15:22:33 he Exp $
 
 .if !defined(_BSD_OWN_MK_)
 _BSD_OWN_MK_=1
@@ -697,6 +697,13 @@
 .endfor
 
 #
+# Exceptions to the above:
+#
+.if ${MACHINE} == "evbppc"
+MKKMOD=                no
+.endif
+
+#
 # MK* options which default to "no".
 #
 _MKVARS.no= \