git: 9f27341c336a - main - local.meta.sys.mk set BOOTSTRAPPING
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 03 May 2023 19:20:51 UTC
The branch main has been updated by sjg:
URL: https://cgit.FreeBSD.org/src/commit/?id=9f27341c336aa12f6c7163c17e646e76c813b689
commit 9f27341c336aa12f6c7163c17e646e76c813b689
Author: Simon J. Gerraty <sjg@FreeBSD.org>
AuthorDate: 2023-05-03 19:20:02 +0000
Commit: Simon J. Gerraty <sjg@FreeBSD.org>
CommitDate: 2023-05-03 19:20:02 +0000
local.meta.sys.mk set BOOTSTRAPPING
When building for host on non-FreeBSD
some makefiles want to see BOOTSTRAPPING defined.
With this libmd and hence nmtree build ok
---
share/mk/local.meta.sys.mk | 5 +++++
targets/pseudo/host-tools/Makefile.depend.host | 14 +++-----------
usr.sbin/nmtree/Makefile.depend.host | 13 +++++++++++++
3 files changed, 21 insertions(+), 11 deletions(-)
diff --git a/share/mk/local.meta.sys.mk b/share/mk/local.meta.sys.mk
index bcf25e2e5cd4..9d66e7295a0a 100644
--- a/share/mk/local.meta.sys.mk
+++ b/share/mk/local.meta.sys.mk
@@ -181,4 +181,9 @@ $V?= ${${V:S,DEP_,,}}
.endfor
.endif
+.if ${MACHINE} == "host" && ${.MAKE.OS} != "FreeBSD"
+# some makefiles expect this
+BOOTSTRAPPING= 0
+.endif
+
.endif
diff --git a/targets/pseudo/host-tools/Makefile.depend.host b/targets/pseudo/host-tools/Makefile.depend.host
index a4525705b64b..39324fc6d49d 100644
--- a/targets/pseudo/host-tools/Makefile.depend.host
+++ b/targets/pseudo/host-tools/Makefile.depend.host
@@ -4,21 +4,13 @@ DIRDEPS= \
usr.bin/file2c \
usr.bin/lex \
usr.bin/mkdep \
+ usr.bin/mkimg \
usr.bin/rpcgen \
usr.bin/sed \
- usr.bin/xargs \
- usr.bin/yacc \
- usr.bin/mkimg \
usr.bin/tar \
+ usr.bin/yacc \
usr.sbin/makefs \
-
-# these need work
-xDIRDEPS+= \
- bin/dd \
- bin/sh \
- usr.bin/lockf \
- usr.bin/stat \
- usr.sbin/mtree \
+ usr.sbin/nmtree \
.include <dirdeps.mk>
diff --git a/usr.sbin/nmtree/Makefile.depend.host b/usr.sbin/nmtree/Makefile.depend.host
new file mode 100644
index 000000000000..3fd283542a53
--- /dev/null
+++ b/usr.sbin/nmtree/Makefile.depend.host
@@ -0,0 +1,13 @@
+# $FreeBSD$
+# Autogenerated - do NOT edit!
+
+DIRDEPS = \
+ lib/libmd \
+ lib/libnetbsd \
+
+
+.include <dirdeps.mk>
+
+.if ${DEP_RELDIR} == ${_DEP_RELDIR}
+# local dependencies - needed for -jN in clean tree
+.endif