From f0e8281b7c550a542cd23076498a690bf29cfb4d Mon Sep 17 00:00:00 2001
From: Josef 'Jeff' Sipek <jeffpc@josefsipek.net>
Date: Sun, 19 Nov 2017 17:11:12 -0500
Subject: [PATCH] bmake-ify mbh_patch

This is a built-time tool only, so it should be built only natively and not
get installed.
---
 tools/Makefile                                 |  3 +-
 tools/mbh_patch/.gitignore                     |  1 +
 tools/mbh_patch/Makefile                       |  6 ++++
 {usr/src/tools => tools}/mbh_patch/mbh_patch.c |  0
 usr/src/Makefile.master                        |  2 +-
 usr/src/pkg/manifests/developer-build-onbld.mf |  1 -
 usr/src/tools/Makefile                         |  1 -
 usr/src/tools/mbh_patch/Makefile               | 44 --------------------------
 8 files changed, 10 insertions(+), 48 deletions(-)
 create mode 100644 tools/mbh_patch/.gitignore
 create mode 100644 tools/mbh_patch/Makefile
 rename {usr/src/tools => tools}/mbh_patch/mbh_patch.c (100%)
 delete mode 100644 usr/src/tools/mbh_patch/Makefile

diff --git a/tools/Makefile b/tools/Makefile
index de47dba9e8..e68a7a7d1b 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -1,3 +1,4 @@
-SUBDIR=mkconfig
+SUBDIR=mkconfig \
+       mbh_patch
 
 .include <bsd.subdir.mk>
diff --git a/tools/mbh_patch/.gitignore b/tools/mbh_patch/.gitignore
new file mode 100644
index 0000000000..65df964b60
--- /dev/null
+++ b/tools/mbh_patch/.gitignore
@@ -0,0 +1 @@
+mbh_patch
diff --git a/tools/mbh_patch/Makefile b/tools/mbh_patch/Makefile
new file mode 100644
index 0000000000..3b55950faa
--- /dev/null
+++ b/tools/mbh_patch/Makefile
@@ -0,0 +1,6 @@
+PROG=	mbh_patch
+
+CPPFLAGS+=	-I${SRCTOP}/include
+
+.include <prog.mk>
+.include <unleashed.mk>
diff --git a/usr/src/tools/mbh_patch/mbh_patch.c b/tools/mbh_patch/mbh_patch.c
similarity index 100%
rename from usr/src/tools/mbh_patch/mbh_patch.c
rename to tools/mbh_patch/mbh_patch.c
diff --git a/usr/src/Makefile.master b/usr/src/Makefile.master
index c495ccf499..27211d1a53 100644
--- a/usr/src/Makefile.master
+++ b/usr/src/Makefile.master
@@ -83,7 +83,7 @@ DOCBOOK_XSL_ROOT=	/usr/share/sgml/docbook/xsl-stylesheets
 RPCGEN=		/usr/bin/rpcgen
 STABS=		$(ONBLD_TOOLS)/bin/$(MACH)/stabs
 ELFEXTRACT=	$(ONBLD_TOOLS)/bin/$(MACH)/elfextract
-MBH_PATCH=	$(ONBLD_TOOLS)/bin/$(MACH)/mbh_patch
+MBH_PATCH=	$(CODEMGR_WS)/tools/mbh_patch/mbh_patch
 BTXLD=		$(ONBLD_TOOLS)/bin/$(MACH)/btxld
 ECHO=		echo
 INS=		/usr/bin/install
diff --git a/usr/src/pkg/manifests/developer-build-onbld.mf b/usr/src/pkg/manifests/developer-build-onbld.mf
index 76879a3cec..40f03a7058 100644
--- a/usr/src/pkg/manifests/developer-build-onbld.mf
+++ b/usr/src/pkg/manifests/developer-build-onbld.mf
@@ -67,7 +67,6 @@ file path=opt/onbld/bin/$(ARCH)/ctfstrip mode=0555
 $(i386_ONLY)file path=opt/onbld/bin/$(ARCH)/elfextract mode=0555
 $(sparc_ONLY)file path=opt/onbld/bin/$(ARCH)/forth mode=0555
 $(sparc_ONLY)file path=opt/onbld/bin/$(ARCH)/forth_preload.so.1 mode=0555
-$(i386_ONLY)file path=opt/onbld/bin/$(ARCH)/mbh_patch mode=0555
 file path=opt/onbld/bin/$(ARCH)/ndrgen mode=0555
 file path=opt/onbld/bin/$(ARCH)/ndrgen1 mode=0555
 file path=opt/onbld/bin/$(ARCH)/pmodes mode=0555
diff --git a/usr/src/tools/Makefile b/usr/src/tools/Makefile
index b11c0b12be..b02178ee1a 100644
--- a/usr/src/tools/Makefile
+++ b/usr/src/tools/Makefile
@@ -45,7 +45,6 @@ sparc_SUBDIRS= \
 
 i386_SUBDIRS=		\
 	elfextract	\
-	mbh_patch	\
 	btxld
 
 SUBDIRS= \
diff --git a/usr/src/tools/mbh_patch/Makefile b/usr/src/tools/mbh_patch/Makefile
deleted file mode 100644
index 2b6f63378c..0000000000
--- a/usr/src/tools/mbh_patch/Makefile
+++ /dev/null
@@ -1,44 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-
-#
-# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-
-include		../Makefile.tools
-
-PROG	= mbh_patch
-
-include ../Makefile.tools
-
-CPPFLAGS += -I../../../../include
-
-.KEEP_STATE:
-
-all: $(PROG)
-
-install: all .WAIT $(ROOTONBLDMACHPROG)
-
-clean:
-	$(RM) mbh_patch
-
-include ../Makefile.targ
-- 
2.11.4.GIT