[src/trunk]: src PR port-mvme68k/56146

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

details:   https://anonhg.NetBSD.org/src/rev/d36efc8115af
branches:  trunk
changeset: 379047:d36efc8115af
user:      rin <rin%NetBSD.org@localhost>
date:      Thu May 06 13:23:36 2021 +0000

description:
PR port-mvme68k/56146

Build wrtvid as tools.

diffstat:

 share/mk/bsd.own.mk                     |   4 +++-
 sys/arch/mvme68k/stand/Makefile         |   6 +-----
 sys/arch/mvme68k/stand/Makefile.booters |  11 ++---------
 sys/arch/mvme68k/stand/wrtvid/Makefile  |  14 +++++---------
 sys/arch/mvme68k/stand/wrtvid/wrtvid.c  |   6 +++++-
 tools/Makefile                          |   6 +++++-
 tools/mvme68k-wrtvid/Makefile           |   6 ++++++
 7 files changed, 27 insertions(+), 26 deletions(-)

diffs (135 lines):

diff -r 17346c348035 -r d36efc8115af share/mk/bsd.own.mk
--- a/share/mk/bsd.own.mk       Thu May 06 13:07:00 2021 +0000
+++ b/share/mk/bsd.own.mk       Thu May 06 13:23:36 2021 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.own.mk,v 1.1246 2021/04/25 21:55:58 christos Exp $
+#      $NetBSD: bsd.own.mk,v 1.1247 2021/05/06 13:23:36 rin Exp $
 
 # This needs to be before bsd.init.mk
 .if defined(BSD_MK_COMPAT_FILE)
@@ -492,6 +492,7 @@ TOOL_MKUBOOTIMAGE=  ${TOOLDIR}/bin/${_TOO
 TOOL_ELFTOSB=          ${TOOLDIR}/bin/${_TOOL_PREFIX}elftosb
 TOOL_MSGC=             MSGDEF=${TOOLDIR}/share/misc ${TOOLDIR}/bin/${_TOOL_PREFIX}msgc
 TOOL_MTREE=            ${TOOLDIR}/bin/${_TOOL_PREFIX}mtree
+TOOL_MVME68KWRTVID=    ${TOOLDIR}/bin/${_TOOL_PREFIX}mvme68k-wrtvid
 TOOL_NBPERF=           ${TOOLDIR}/bin/${_TOOL_PREFIX}perf
 TOOL_NCDCS=            ${TOOLDIR}/bin/${_TOOL_PREFIX}ibmnws-ncdcs
 TOOL_PAX=              ${TOOLDIR}/bin/${_TOOL_PREFIX}pax
@@ -606,6 +607,7 @@ TOOL_MKUBOOTIMAGE=  mkubootimage
 TOOL_ELFTOSB=          elftosb
 TOOL_MSGC=             msgc
 TOOL_MTREE=            mtree
+TOOL_MVME68KWRTVID=    wrtvid
 TOOL_NBPERF=           nbperf
 TOOL_NCDCS=            ncdcs
 TOOL_PAX=              pax
diff -r 17346c348035 -r d36efc8115af sys/arch/mvme68k/stand/Makefile
--- a/sys/arch/mvme68k/stand/Makefile   Thu May 06 13:07:00 2021 +0000
+++ b/sys/arch/mvme68k/stand/Makefile   Thu May 06 13:23:36 2021 +0000
@@ -1,10 +1,6 @@
-#      $NetBSD: Makefile,v 1.6 2009/01/19 23:09:16 he Exp $
+#      $NetBSD: Makefile,v 1.7 2021/05/06 13:23:36 rin Exp $
 
 SUBDIR= libbug libsa .WAIT sboot netboot bootxx bootsd bootst \
        installboot
 
-.ifmake !install
-SUBDIR+= wrtvid
-.endif
-
 .include <bsd.subdir.mk>
diff -r 17346c348035 -r d36efc8115af sys/arch/mvme68k/stand/Makefile.booters
--- a/sys/arch/mvme68k/stand/Makefile.booters   Thu May 06 13:07:00 2021 +0000
+++ b/sys/arch/mvme68k/stand/Makefile.booters   Thu May 06 13:23:36 2021 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.booters,v 1.27 2021/04/15 01:54:39 mrg Exp $
+#      $NetBSD: Makefile.booters,v 1.28 2021/05/06 13:23:36 rin Exp $
 
 S?=            ${.CURDIR}/../../../..
 MDEC_DIR?=     /usr/mdec
@@ -73,13 +73,6 @@ BUGCRT=${LIBBUG_DIR}/bugstart.o
        @echo making sure the bugcrt is up to date...
        @(cd ${LIB_BUG_DIR}; ${MAKE} bugstart.o)
 
-WRTVID_BOOT_DIR=  ${.CURDIR}/../wrtvid
-WRTVID_DIR!=   cd ${WRTVID_BOOT_DIR} && ${PRINTOBJDIR}
-WRTVID=${WRTVID_DIR}/wrtvid
-
-.PHONY: ${WRTVID}
-${WRTVID}:
-       @echo making sure the wrtvid is up to date...
-       @(cd ${WRTVID_BOOT_DIR}; ${MAKE} dependall)
+WRTVID=        ${TOOL_MVME68KWRTVID}
 
 .endif
diff -r 17346c348035 -r d36efc8115af sys/arch/mvme68k/stand/wrtvid/Makefile
--- a/sys/arch/mvme68k/stand/wrtvid/Makefile    Thu May 06 13:07:00 2021 +0000
+++ b/sys/arch/mvme68k/stand/wrtvid/Makefile    Thu May 06 13:23:36 2021 +0000
@@ -1,12 +1,8 @@
-#      $NetBSD: Makefile,v 1.12 2018/05/01 19:59:45 christos Exp $
+#      $NetBSD: Makefile,v 1.13 2021/05/06 13:23:36 rin Exp $
 
-S=${.CURDIR}/../../../../
-
-.include <bsd.hostinit.mk>
+.include <bsd.init.mk>
 
-HOSTPROG=      wrtvid
+PROG=  wrtvid
+MKMAN= no
 
-# only needed during build
-proginstall::
-
-.include <bsd.hostprog.mk>
+.include <bsd.prog.mk>
diff -r 17346c348035 -r d36efc8115af sys/arch/mvme68k/stand/wrtvid/wrtvid.c
--- a/sys/arch/mvme68k/stand/wrtvid/wrtvid.c    Thu May 06 13:07:00 2021 +0000
+++ b/sys/arch/mvme68k/stand/wrtvid/wrtvid.c    Thu May 06 13:23:36 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: wrtvid.c,v 1.9 2019/01/08 00:00:53 rin Exp $   */
+/*     $NetBSD: wrtvid.c,v 1.10 2021/05/06 13:23:36 rin Exp $  */
 
 /*-
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -29,6 +29,10 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
diff -r 17346c348035 -r d36efc8115af tools/Makefile
--- a/tools/Makefile    Thu May 06 13:07:00 2021 +0000
+++ b/tools/Makefile    Thu May 06 13:23:36 2021 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.208 2021/04/25 15:11:28 christos Exp $
+#      $NetBSD: Makefile,v 1.209 2021/05/06 13:23:36 rin Exp $
 
 .include <bsd.own.mk>
 .include <bsd.endian.mk>
@@ -219,6 +219,10 @@ SUBDIR+=   libfdt .WAIT
 SUBDIR+=       dtc
 .endif
 
+.if ${MACHINE} == "mvme68k"
+SUBDIR+=       mvme68k-wrtvid
+.endif
+
 .if ${MKX11} != "no"
 SUBDIR+=       makestrs
 SUBDIR+=       makekeys
diff -r 17346c348035 -r d36efc8115af tools/mvme68k-wrtvid/Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/tools/mvme68k-wrtvid/Makefile     Thu May 06 13:23:36 2021 +0000
@@ -0,0 +1,6 @@
+#      $NetBSD: Makefile,v 1.1 2021/05/06 13:23:36 rin Exp $
+
+HOSTPROGNAME=  ${_TOOL_PREFIX}mvme68k-wrtvid
+HOST_SRCDIR=   sys/arch/mvme68k/stand/wrtvid
+
+.include "${.CURDIR}/../Makefile.host"