From 09b5dada8b868b6dd89814ff65994c7782783076 Mon Sep 17 00:00:00 2001
From: tsutsui <tsutsui@NetBSD.org>
Date: Fri, 31 May 2024 20:52:58 +0000
Subject: [PATCH] Build mkhybrid as a build tool.

---
 share/mk/bsd.own.mk     | 3 ++-
 tools/Makefile          | 6 +++++-
 tools/mkhybrid/Makefile | 9 +++++++++
 3 files changed, 16 insertions(+), 2 deletions(-)
 create mode 100644 tools/mkhybrid/Makefile

diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk
index 83c151265ec9..45df5bdce409 100644
--- a/share/mk/bsd.own.mk
+++ b/share/mk/bsd.own.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.own.mk,v 1.1374 2024/05/29 02:06:45 riastradh Exp $
+#	$NetBSD: bsd.own.mk,v 1.1375 2024/05/31 20:52:58 tsutsui Exp $
 
 # This needs to be before bsd.init.mk
 .if defined(BSD_MK_COMPAT_FILE)
@@ -488,6 +488,7 @@ TOOL_M68KELF2AOUT=	${TOOLDIR}/bin/${_TOOL_PREFIX}m68k-elf2aout
 TOOL_MIPSELF2ECOFF=	${TOOLDIR}/bin/${_TOOL_PREFIX}mips-elf2ecoff
 TOOL_MKCSMAPPER=	${TOOLDIR}/bin/${_TOOL_PREFIX}mkcsmapper
 TOOL_MKESDB=		${TOOLDIR}/bin/${_TOOL_PREFIX}mkesdb
+TOOL_MKHYBRID=		${TOOLDIR}/bin/${_TOOL_PREFIX}mkhybrid
 TOOL_MKLOCALE=		${TOOLDIR}/bin/${_TOOL_PREFIX}mklocale
 TOOL_MKMAGIC=		${TOOLDIR}/bin/${_TOOL_PREFIX}file
 TOOL_MKNOD=		${TOOLDIR}/bin/${_TOOL_PREFIX}mknod
diff --git a/tools/Makefile b/tools/Makefile
index 4e1245cfc8c6..48d240eed4d2 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.220 2024/05/23 02:50:47 gutteridge Exp $
+#	$NetBSD: Makefile,v 1.221 2024/05/31 20:52:58 tsutsui Exp $
 
 .include <bsd.own.mk>
 .include <bsd.endian.mk>
@@ -230,6 +230,10 @@ SUBDIR+=	dtc
 SUBDIR+=	mvme68k-wrtvid
 .endif
 
+.if ${MACHINE} == "mac68k" || ${MACHINE} == "macppc"
+SUBDIR+=	mkhybrid
+.endif
+
 .if ${MKX11} != "no"
 SUBDIR+=	makestrs
 SUBDIR+=	makekeys
diff --git a/tools/mkhybrid/Makefile b/tools/mkhybrid/Makefile
new file mode 100644
index 000000000000..52dff7bd4978
--- /dev/null
+++ b/tools/mkhybrid/Makefile
@@ -0,0 +1,9 @@
+#	$NetBSD: Makefile,v 1.1 2024/05/31 20:52:59 tsutsui Exp $
+#
+
+HOSTPROGNAME=   ${_TOOL_PREFIX}mkhybrid
+HOST_SRCDIR=    external/gpl2/mkhybrid/bin
+HOST_CPPFLAGS=  -I${.CURDIR}
+
+.include "${.CURDIR}/../Makefile.nbincludes"
+.include "${.CURDIR}/../Makefile.host"