From nobody Wed Feb 8 22:59:33 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 4PBwRp04TDz3n5Nk;
Wed, 8 Feb 2023 22:59:34 +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 4PBwRn6f4kz425J;
Wed, 8 Feb 2023 22:59:33 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1675897173;
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=0SJd1GGuB9gR2grmRaljh3+mOVzuzaA8/Gftr8B9au8=;
b=SjYo2ioee8gDlxlZxS/KpWOrWlDxXqZp0QeEaO7tT1p3e7ir6bqoy4vyPgDdCXz6Rr6N3a
WN9jxWNtXZNgETjDNJ1L/3o9IZhf2VWFgsoKOSODKtIL4hdFarL2ahjMjNN7DO0MjApP2t
sEHVEy56S/p7BXVf/aIDMijCtWMdV3JjcVu+79i4jT6hg/bFWJnvULrLKkyKydEgTqQg+q
KyruVmE83Bs846Dp6mUkwShtIT+bPs5kIlRofTEYqNmgV8Tcpt7/B1NSeTWHCnouJnjA3r
GHVb6yzXxoTdil4XJ4OiA16tAY3IsQcmkszgU1GOHtrNMdoq81U5LeBKeW2Hnw==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1675897173;
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=0SJd1GGuB9gR2grmRaljh3+mOVzuzaA8/Gftr8B9au8=;
b=K56jmm8aJd9uNmO1qgNjQomCPYo0aocMWwrmLCFGFepjdhBbG0YrIPODGsv0Kv0sp2S8/p
l6FQZ+aN1Zv99SltnaBN6mOPm5fxVVXaHw0g43fwXjbXUMcd0WRxWj/gmwtmpsqkmwfggM
0V2cQyEk2d8dTcJY267S/1FJp2s/M8fUhEFy06GRGRm0TKDjhQKj2lwwaCkuY2GOgZ8u47
IiUydk3dojQYau9yI70HyU5tOBO3PqDbVLNmmWeq/KELt0c35iJgEyJW6UsrlnwlnEqKNR
NZSqMBPPFedafAXmnttrCXrDjsEsdjLrup4aEXWsgm1vK9uAzeV3LoT8F90U2Q==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675897173; a=rsa-sha256; cv=none;
b=TUwel1D6pcwZaWbgM2GvU9vRnrzgv9CL8HkBZV/0ACR+pBga6Ct2A9KwAJxnliHk/837OG
/AmwhsmlSlXz4umFTgJyoMgSyANgfpaTqvxtYpuhv82nyliCGa14FwL9196ILP0T18aXD2
ldMOtDT8RGh9YwDRi6rOtWwcx/+MDLEIJucfPYE7vkLkGzf15aFvdKv2NEKxKHKIhN0XPQ
mfVyZMcHDK3Q3Fn/XWb8lrvFX5B5n91YjTbNiFZrVk8yD263KyNM3qnTXBtSITSTYIkDOw
sASqTGRB1EQ74aFpTxO0uEghi0w1aco4x4/ykXFwY90nauN+O9DyPWXC2KUf2w==
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 4PBwRn5jCGzFSx;
Wed, 8 Feb 2023 22:59:33 +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 318MxXG0024069;
Wed, 8 Feb 2023 22:59:33 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 318MxXdm024068;
Wed, 8 Feb 2023 22:59:33 GMT
(envelope-from git)
Date: Wed, 8 Feb 2023 22:59:33 GMT
Message-Id: <202302082259.318MxXdm024068@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: =?utf-8?Q?Dag-Erling=20Sm=C3=B8rgrav?= <des@FreeBSD.org>
Subject: git: 0dfaefa97547 - main - depend-cleanup.sh: Simplify the logic, and clean bootstrap tools.
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
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: des
X-Git-Repository: src
X-Git-Refname: refs/heads/main
X-Git-Reftype: branch
X-Git-Commit: 0dfaefa975477cee2ec3155c3e0689ba1fcdde9a
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch main has been updated by des:
URL: https://cgit.FreeBSD.org/src/commit/?id=0dfaefa975477cee2ec3155c3e0689ba1fcdde9a
commit 0dfaefa975477cee2ec3155c3e0689ba1fcdde9a
Author: Dag-Erling Smørgrav <des@FreeBSD.org>
AuthorDate: 2023-02-08 22:58:51 +0000
Commit: Dag-Erling Smørgrav <des@FreeBSD.org>
CommitDate: 2023-02-08 22:59:13 +0000
depend-cleanup.sh: Simplify the logic, and clean bootstrap tools.
* There's no need to check if the file exists before grepping it; if it does not exist, grep will fail, which is what we want. Just redirect the error message to /dev/null.
* There's no need to split the .o and .pico cases; the bodies are identical, so combine the conditions. Use a glob to avoid a false negative if one exists but not the other.
* Also run depend-cleanup.sh on the bootstrap build tree. This unbreaks the build after 29c5f8bf9a01.
Sponsored by: Klara, Inc.
Sponsored by: NetApp, Inc.
Reviewed by: imp, emaste
Differential Revision: https://reviews.freebsd.org/D38447
---
Makefile.inc1 | 3 +++
tools/build/depend-cleanup.sh | 14 ++------------
2 files changed, 5 insertions(+), 12 deletions(-)
diff --git a/Makefile.inc1 b/Makefile.inc1
index 2f84d882e966..c5848be438a2 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -1062,6 +1062,9 @@ _bootstrap-tools:
@echo "--------------------------------------------------------------"
@echo ">>> stage 1.2: bootstrap tools"
@echo "--------------------------------------------------------------"
+.if ${MK_CLEAN} != "yes"
+ ${_+_}cd ${.CURDIR}; ${BMAKE} _NO_INCLUDE_COMPILERMK=t _cleanobj_fast_depend_hack
+.endif
${_+_}cd ${.CURDIR}; ${BMAKE} bootstrap-tools
mkdir -p ${WORLDTMP}/usr ${WORLDTMP}/lib/casper ${WORLDTMP}/lib/geom \
${WORLDTMP}/bin
diff --git a/tools/build/depend-cleanup.sh b/tools/build/depend-cleanup.sh
index 0d1c5521542c..4739127f396a 100755
--- a/tools/build/depend-cleanup.sh
+++ b/tools/build/depend-cleanup.sh
@@ -28,18 +28,8 @@ fi
# $3 source extension
clean_dep()
{
- if [ -e "$OBJTOP"/$1/.depend.$2.pico ] && \
- egrep -qw "$2\.$3" "$OBJTOP"/$1/.depend.$2.pico; then \
- echo "Removing stale dependencies and objects for $2.$3"; \
- rm -f \
- "$OBJTOP"/$1/.depend.$2.* \
- "$OBJTOP"/$1/$2.*o \
- "$OBJTOP"/obj-lib32/$1/.depend.$2.* \
- "$OBJTOP"/obj-lib32/$1/$2.*o
- fi
- if [ -e "$OBJTOP"/$1/.depend.$2.o ] && \
- egrep -qw "$2\.$3" "$OBJTOP"/$1/.depend.$2.o; then \
- echo "Removing stale dependencies and objects for $2.$3"; \
+ if egrep -qw "$2\.$3" "$OBJTOP"/$1/.depend.$2.*o 2>/dev/null; then
+ echo "Removing stale dependencies and objects for $2.$3"
rm -f \
"$OBJTOP"/$1/.depend.$2.* \
"$OBJTOP"/$1/$2.*o \