From nobody Wed May 3 19:20:51 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QBRcg5N9Xz499tc; Wed, 3 May 2023 19:20:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QBRcg4k1Dz3jDQ; Wed, 3 May 2023 19:20:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683141651; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KspyJSuFXY4dTKqgrjcZnMWKwKZDDQ+gi+HZlY02FxQ=; b=aTKUIPKaxurF7nE6vEt7HFCG8/0NC3mkCkl0FCPnK1+RyvJ8yelM/CiKN4ZYxE5hIBtsWy bFSEVxy2Y96Rk53R94JX6hMYhUZ4lFCkFhVxt1AjEsZqvwHw1PInX53W/F5BpP5y05z3UM zS9BptzTEIeOhQyMGHfogJN5q+sPYtlVsId3cw6K6gjNKbmQHGEeVEnSFaJfe+HCcdLZqs Hctgmg4DNiR+wyCNENKpGQSXi3u4OYcqLBF/ihwciWndW2cCV3RgD+rLitSfySfU8L9roj YV8Qpr2DylapKOsy3Cb6C9psT8i0hisV63rqglpxyh0O2oQEeM40laWCHQZWyQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683141651; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KspyJSuFXY4dTKqgrjcZnMWKwKZDDQ+gi+HZlY02FxQ=; b=ASecF+vxUhzzq9dvl6oRZyDOq/jE2aLXg2Q4CjwsLGwV/BBLIw98l5sHaMdHx0bOFgXlRv H+Rq/sPSuCzQEGthX0rcyL4qeECe2ipM8IO8ltb4crf+f51bX4aqewtVnoBLj6JsFv7eKW frbf4Jft1e025k9/VccFQCmoSFeSWIDCVmP3hi31Qho8mbieRQAyMwnvaaFIFIScafE60t zGo2hsbDSAb9UCrdy/hYz6bpzcMfdE2C9VS/JYdhIcYF24nHVWVqszRopNVTNsLAjnHMqH 0zHSsZQByYcSgJA3DYOVszoh7SdFxlIUksqQ52xrgV6PZkahB38YeMnT/gDeAg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683141651; a=rsa-sha256; cv=none; b=mlZucbQmnnCDjUHay0VCoFIJYYIAQVHF8PM9ZzNIVFrEcBEFw6aL4oRBoE/mEuweYWA+k/ F9Pnjyj1pwzdafn31FG1/s5p8vRelpZotgrQG+r/Hes52LFpwI6tzFL45rD7TL/oV9lyk2 D0lDrmmV/0W5b0yegYaLPTT6FZ4nUVhpvq72oLEAQEQv6JPbxkqK60EejmU4wLn3XDfxGJ FR9c8jnAIhZB9LOB8e4blZSdvLsOYGkFVh58VvYFSnlDGJRtpHlrkZvLmj5HLiR8YCFvKC n1dtLwFDAMC3Ny+cYpBuP8JSiubp8rDJ9XeLa6igYgxX5zuf8Si7OgvVVIhCzg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QBRcg3n97zj2H; Wed, 3 May 2023 19:20:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 343JKpqU047175; Wed, 3 May 2023 19:20:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 343JKpx8047174; Wed, 3 May 2023 19:20:51 GMT (envelope-from git) Date: Wed, 3 May 2023 19:20:51 GMT Message-Id: <202305031920.343JKpx8047174@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Simon J. Gerraty" Subject: git: 9f27341c336a - main - local.meta.sys.mk set BOOTSTRAPPING List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9f27341c336aa12f6c7163c17e646e76c813b689 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by sjg: URL: https://cgit.FreeBSD.org/src/commit/?id=9f27341c336aa12f6c7163c17e646e76c813b689 commit 9f27341c336aa12f6c7163c17e646e76c813b689 Author: Simon J. Gerraty AuthorDate: 2023-05-03 19:20:02 +0000 Commit: Simon J. Gerraty 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 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 + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif