Module Name: src
Committed By: mrg
Date: Mon Jan 5 00:51:51 UTC 2015
Modified Files:
src/distrib/sets/lists/base: ad.arm
src/distrib/sets/lists/debug: ad.arm
src/distrib/sets/lists/man: mi
src/external/bsd/elftosb: Makefile
Log Message:
elftosb depends upon MKCXX.
To generate a diff of this commit:
cvs rdiff -u -r1.65 -r1.66 src/distrib/sets/lists/base/ad.arm
cvs rdiff -u -r1.54 -r1.55 src/distrib/sets/lists/debug/ad.arm
cvs rdiff -u -r1.1492 -r1.1493 src/distrib/sets/lists/man/mi
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/elftosb/Makefile
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/lists/base/ad.arm
diff -u src/distrib/sets/lists/base/ad.arm:1.65 src/distrib/sets/lists/base/ad.arm:1.66
--- src/distrib/sets/lists/base/ad.arm:1.65 Fri Jan 2 21:18:51 2015
+++ src/distrib/sets/lists/base/ad.arm Mon Jan 5 00:51:50 2015
@@ -1,4 +1,4 @@
-# $NetBSD: ad.arm,v 1.65 2015/01/02 21:18:51 christos Exp $
+# $NetBSD: ad.arm,v 1.66 2015/01/05 00:51:50 mrg Exp $
./lib/oabi base-compat-shlib compat
./lib/oabi/npf base-npf-shlib compat
./lib/oabi/npf/ext_log.so base-npf-shlib compat,pic
@@ -397,7 +397,7 @@
./usr/sbin/apm base-sysutil-bin
./usr/sbin/apmd base-sysutil-bin
./usr/sbin/eeprom base-sysutil-bin
-./usr/sbin/elftosb base-sysutil-bin endian=1234
+./usr/sbin/elftosb base-sysutil-bin endian=1234,cxx
./usr/sbin/ofctl base-sysutil-bin
./usr/sbin/sbkeygen base-sysutil-bin endian=1234
./usr/sbin/sbtool base-sysutil-bin endian=1234
Index: src/distrib/sets/lists/debug/ad.arm
diff -u src/distrib/sets/lists/debug/ad.arm:1.54 src/distrib/sets/lists/debug/ad.arm:1.55
--- src/distrib/sets/lists/debug/ad.arm:1.54 Fri Jan 2 21:18:51 2015
+++ src/distrib/sets/lists/debug/ad.arm Mon Jan 5 00:51:50 2015
@@ -1,4 +1,4 @@
-# $NetBSD: ad.arm,v 1.54 2015/01/02 21:18:51 christos Exp $
+# $NetBSD: ad.arm,v 1.55 2015/01/05 00:51:50 mrg Exp $
./usr/lib/libarm_g.a comp-c-debuglib debuglib
./usr/lib/libc_vfp_g.a comp-c-debuglib debuglib,softfloat
./usr/lib/libpmc_g.a comp-c-debuglib debuglib
@@ -213,7 +213,7 @@
./usr/libdata/debug/usr/sbin/apm.debug comp-sysutil-debug debug
./usr/libdata/debug/usr/sbin/apmd.debug comp-sysutil-debug debug
./usr/libdata/debug/usr/sbin/eeprom.debug comp-util-debug debug
-./usr/libdata/debug/usr/sbin/elftosb.debug comp-util-debug debug,endian=1234
+./usr/libdata/debug/usr/sbin/elftosb.debug comp-util-debug debug,endian=1234,cxx
./usr/libdata/debug/usr/sbin/ofctl.debug comp-util-debug debug
./usr/libdata/debug/usr/sbin/sbkeygen.debug comp-util-debug debug,endian=1234
./usr/libdata/debug/usr/sbin/sbtool.debug comp-util-debug debug,endian=1234
Index: src/distrib/sets/lists/man/mi
diff -u src/distrib/sets/lists/man/mi:1.1492 src/distrib/sets/lists/man/mi:1.1493
--- src/distrib/sets/lists/man/mi:1.1492 Tue Dec 30 04:22:18 2014
+++ src/distrib/sets/lists/man/mi Mon Jan 5 00:51:50 2015
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1492 2014/12/30 04:22:18 mrg Exp $
+# $NetBSD: mi,v 1.1493 2015/01/05 00:51:50 mrg Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -2424,7 +2424,7 @@
./usr/share/man/cat8/etcupdate.0 man-sysutil-catman .cat
./usr/share/man/cat8/evbarm/MAKEDEV.0 man-obsolete obsolete
./usr/share/man/cat8/evbarm/bootmini2440.0 man-sysutil-catman .cat
-./usr/share/man/cat8/evbarm/elftosb.0 man-sysutil-catman .cat
+./usr/share/man/cat8/evbarm/elftosb.0 man-sysutil-catman .cat,cxx
./usr/share/man/cat8/evbarm/makedev.0 man-obsolete obsolete
./usr/share/man/cat8/evbarm/sbkeygen.0 man-sysutil-catman .cat
./usr/share/man/cat8/evbarm/sbtool.0 man-sysutil-catman .cat
@@ -5328,7 +5328,7 @@
./usr/share/man/html8/eshconfig.html man-sysutil-htmlman html
./usr/share/man/html8/etcupdate.html man-sysutil-htmlman html
./usr/share/man/html8/evbarm/bootmini2440.html man-sysutil-htmlman html
-./usr/share/man/html8/evbarm/elftosb.html man-sysutil-htmlman html
+./usr/share/man/html8/evbarm/elftosb.html man-sysutil-htmlman html,cxx
./usr/share/man/html8/evbarm/sbkeygen.html man-sysutil-htmlman html
./usr/share/man/html8/evbarm/sbtool.html man-sysutil-htmlman html
./usr/share/man/html8/extattrctl.html man-sysutil-htmlman html
@@ -8301,7 +8301,7 @@
./usr/share/man/man8/etcupdate.8 man-sysutil-man .man
./usr/share/man/man8/evbarm/MAKEDEV.8 man-obsolete obsolete
./usr/share/man/man8/evbarm/bootmini2440.8 man-sysutils-man .man
-./usr/share/man/man8/evbarm/elftosb.8 man-sysutil-man .man
+./usr/share/man/man8/evbarm/elftosb.8 man-sysutil-man .man,cxx
./usr/share/man/man8/evbarm/makedev.8 man-obsolete obsolete
./usr/share/man/man8/evbarm/sbkeygen.8 man-sysutil-man .man
./usr/share/man/man8/evbarm/sbtool.8 man-sysutil-man .man
Index: src/external/bsd/elftosb/Makefile
diff -u src/external/bsd/elftosb/Makefile:1.1 src/external/bsd/elftosb/Makefile:1.2
--- src/external/bsd/elftosb/Makefile:1.1 Thu Nov 15 19:49:12 2012
+++ src/external/bsd/elftosb/Makefile Mon Jan 5 00:51:50 2015
@@ -1,8 +1,11 @@
-# $NetBSD: Makefile,v 1.1 2012/11/15 19:49:12 jkunz Exp $
+# $NetBSD: Makefile,v 1.2 2015/01/05 00:51:50 mrg Exp $
.include <bsd.own.mk>
+.if ${MKCXX} != "no"
+
SUBDIR= lib .WAIT usr.sbin
-.include <bsd.subdir.mk>
+.endif
+.include <bsd.subdir.mk>
