Module Name: src
Committed By: tsutsui
Date: Fri May 31 20:52:59 UTC 2024
Modified Files:
src/share/mk: bsd.own.mk
src/tools: Makefile
Added Files:
src/tools/mkhybrid: Makefile
Log Message:
Build mkhybrid as a build tool.
To generate a diff of this commit:
cvs rdiff -u -r1.1374 -r1.1375 src/share/mk/bsd.own.mk
cvs rdiff -u -r1.220 -r1.221 src/tools/Makefile
cvs rdiff -u -r0 -r1.1 src/tools/mkhybrid/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.1374 src/share/mk/bsd.own.mk:1.1375
--- src/share/mk/bsd.own.mk:1.1374 Wed May 29 02:06:45 2024
+++ src/share/mk/bsd.own.mk Fri May 31 20:52:58 2024
@@ -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/${_TOO
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
Index: src/tools/Makefile
diff -u src/tools/Makefile:1.220 src/tools/Makefile:1.221
--- src/tools/Makefile:1.220 Thu May 23 02:50:47 2024
+++ src/tools/Makefile Fri May 31 20:52:58 2024
@@ -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
Added files:
Index: src/tools/mkhybrid/Makefile
diff -u /dev/null src/tools/mkhybrid/Makefile:1.1
--- /dev/null Fri May 31 20:52:59 2024
+++ src/tools/mkhybrid/Makefile Fri May 31 20:52:59 2024
@@ -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"
