Module Name: src
Committed By: he
Date: Fri Dec 11 15:22:33 UTC 2009
Modified Files:
src/distrib/sets: sets.subr
src/distrib/sets/lists/base: mi
src/etc: Makefile
src/share/mk: bsd.own.mk
Added Files:
src/distrib/sets/lists/base: module.mi
Log Message:
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@
To generate a diff of this commit:
cvs rdiff -u -r1.113 -r1.114 src/distrib/sets/sets.subr
cvs rdiff -u -r1.847 -r1.848 src/distrib/sets/lists/base/mi
cvs rdiff -u -r0 -r1.13 src/distrib/sets/lists/base/module.mi
cvs rdiff -u -r1.375 -r1.376 src/etc/Makefile
cvs rdiff -u -r1.605 -r1.606 src/share/mk/bsd.own.mk
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/sets.subr
diff -u src/distrib/sets/sets.subr:1.113 src/distrib/sets/sets.subr:1.114
--- src/distrib/sets/sets.subr:1.113 Fri Dec 11 13:30:11 2009
+++ src/distrib/sets/sets.subr Fri Dec 11 15:22:33 2009
@@ -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
Index: src/distrib/sets/lists/base/mi
diff -u src/distrib/sets/lists/base/mi:1.847 src/distrib/sets/lists/base/mi:1.848
--- src/distrib/sets/lists/base/mi:1.847 Sat Dec 5 20:11:01 2009
+++ src/distrib/sets/lists/base/mi Fri Dec 11 15:22:33 2009
@@ -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
Index: src/etc/Makefile
diff -u src/etc/Makefile:1.375 src/etc/Makefile:1.376
--- src/etc/Makefile:1.375 Sat Dec 5 19:14:39 2009
+++ src/etc/Makefile Fri Dec 11 15:22:33 2009
@@ -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
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.605 src/share/mk/bsd.own.mk:1.606
--- src/share/mk/bsd.own.mk:1.605 Fri Dec 11 08:52:37 2009
+++ src/share/mk/bsd.own.mk Fri Dec 11 15:22:33 2009
@@ -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= \
Added files:
Index: src/distrib/sets/lists/base/module.mi
diff -u /dev/null src/distrib/sets/lists/base/module.mi:1.13
--- /dev/null Fri Dec 11 15:22:33 2009
+++ src/distrib/sets/lists/base/module.mi Fri Dec 11 15:22:33 2009
@@ -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
