From nobody Thu Feb 9 07:31:33 2023 X-Original-To: dev-commits-src-all@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 4PC7pm1TVKz3mv8W for ; Thu, 9 Feb 2023 07:31:44 +0000 (UTC) (envelope-from Alexander@leidinger.net) Received: from mailgate.Leidinger.net (mailgate.leidinger.net [IPv6:2a00:1828:2000:313::1: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-signature ECDSA (P-256) client-digest SHA256) (Client CN "mailgate.leidinger.net", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PC7pl5RlYz422R for ; Thu, 9 Feb 2023 07:31:43 +0000 (UTC) (envelope-from Alexander@leidinger.net) Authentication-Results: mx1.freebsd.org; none Received: from outgoing.leidinger.net (p5b165a22.dip0.t-ipconnect.de [91.22.90.34]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-256) server-digest SHA256 client-signature ECDSA (P-256) client-digest SHA256) (Client CN "outgoing.leidinger.net", Issuer "R3" (verified OK)) by mailgate.Leidinger.net (Postfix) with ESMTPSA id C522D13F4 for ; Thu, 9 Feb 2023 08:31:35 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=leidinger.net; s=outgoing-alex; t=1675927895; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to; bh=TwBHRz2eneB8OeY5eGTVADrZXZQSThF+Rpq/+H+P7+o=; b=ClLLYNny01IKfYa2nkhuKr27pkMW8BlegytSDXE6P0yq/zUtqJavGOp5tbzgwHUMXT+Az+ /dhlswT1sZDP1hzyi/bn1StzUIc8WBKudsAOLFI6EaFucMONh6IOUcAqdvL+VCTU2eXRhf yHNwQI2iwn0zfj3I/cj+zJEVrS4Kz8E/1K7uo7JeKlweg27O+f1VtlFlhOmvok2Uggce/A FL5WC9HIcmIekXuDiV3Uk7GgTFQKlAVYMCAXI8G1oVm3bE7rq9pYuuNzq+32cWqB1S1JFU 04dsNFlnitrxjpSFnZfsf5pS+/WUSED0u4dJ9mySce7XWrJCMtYj5eFnE11l7w== Received: from webmail.leidinger.net (localhost [127.0.0.1]) by outgoing.leidinger.net (Postfix) with ESMTP id 5F54931FC for ; Thu, 9 Feb 2023 08:31:33 +0100 (CET) Received: from www (uid 80) (envelope-from Alexander@leidinger.net) id 814aa by webmail.leidinger.net (DragonFly Mail Agent v0.13+ on webmail.leidinger.net); Thu, 09 Feb 2023 08:31:33 +0100 Date: Thu, 09 Feb 2023 08:31:33 +0100 Message-ID: <20230209083133.Horde.q3w2RmVjVzPwrvCq2u6yNUU@webmail.leidinger.net> From: Alexander Leidinger To: dev-commits-src-all@freebsd.org, Dag-Erling =?utf-8?b?U23DuHJncmF2?= Subject: Re: git: 0dfaefa97547 - main - depend-cleanup.sh: Simplify the logic, and clean bootstrap tools. In-Reply-To: <202302082259.318MxXdm024068@gitrepo.freebsd.org> Accept-Language: de,en Content-Type: multipart/signed; boundary="=_oEKP--qZUYVZNwqdDYHNQBO"; protocol="application/pgp-signature"; micalg=pgp-sha256 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 X-Rspamd-Queue-Id: 4PC7pl5RlYz422R X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:34240, ipnet:2a00:1828::/32, country:DE] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N This message is in MIME format and has been PGP signed. --=_oEKP--qZUYVZNwqdDYHNQBO Content-Type: text/plain; charset=utf-8; format=flowed; DelSp=Yes Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Quoting Dag-Erling Sm=C3=B8rgrav (from Wed, 8 Feb 2023=20= =20 22:59:33=20GMT): > The branch main has been updated by des: > > URL:=20=20 >=20https://cgit.FreeBSD.org/src/commit/?id=3D0dfaefa975477cee2ec3155c3e068= 9ba1fcdde9a > > commit 0dfaefa975477cee2ec3155c3e0689ba1fcdde9a > Author: Dag-Erling Sm=C3=B8rgrav > AuthorDate: 2023-02-08 22:58:51 +0000 > Commit: Dag-Erling Sm=C3=B8rgrav > 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=20=20 >=20it; if it does not exist, grep will fail, which is what we want.=20=20= =20 >=20Just redirect the error message to /dev/null. You change from "no fork+exec if the file doesn't exist" (due to "if"=20=20 and=20"[" being shell-builtins) to "always fork+exec". On fast machines=20= =20 surely=20not an issue, on slow ones, it may make a difference (I have an=20= =20 old=20amd64 machine at an ISP which takes days to do a buildworld with=20= =20 -j2=20due to not much memory, only 2 cores, old HDs, and other stuff=20=20 going=20on in parallel). While the .depend.* namespace is surely controlled by us, would it=20=20 make=20sense to change the glob to ".{o,pico}" instead of ".*o" instead=20= =20 to=20prevent unexpected surprises in the future? > --- 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 \ Bye, Alexander. --=20 http://www.Leidinger.net=20Alexander@Leidinger.net: PGP 0x8F31830F9F2772BF http://www.FreeBSD.org netchild@FreeBSD.org : PGP 0x8F31830F9F2772BF --=_oEKP--qZUYVZNwqdDYHNQBO Content-Type: application/pgp-signature Content-Description: Digitale PGP-Signatur Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIzBAABCAAdFiEER9UlYXp1PSd08nWXEg2wmwP42IYFAmPkoVQACgkQEg2wmwP4 2IYIdhAAkKRnKvCWFS2lQmBfkNQXFTDvj6arZ2yiJut+Coxeil8yQ+33BllkCMYP tzhFYDYQVLIjC/X+8RNsy+XeMRkr9vy0B9CJ7zlDWbv9pjKEeobE7vW4DY69z+Pj XMHetDUq6gGgsIeB3O+bcvExkeeN9XQrUXUtyxaEhQBkI+/buBVCd1hLWlA12XCC JizU05NtZzVTKkjk8B6KnjfGlNGC2hJmyPPvhhy+5vmxeeMfl7L8RQhPbmftYe3n OyoPGgUNZ1vkMmCcON6lGj14Z6HCxmA0MClUvAXHvQIRskRQGV7vpQXsNM24GnXE 7BM9uKzp2qVXFYB4s9ZpcnMFN8x2aUscR/SER4eDoyflA78rANsWWjP1bm+2ECAR 2VgyyLI0nmzlp3Yq2yBPUqHEetCaqDzqEUF8w6cNVrlSPAHrasv3Ts3H9gEwBboZ KP7xFzHK1WFyOLCwiK9Jgk6L8vQs6Kqq9CB3f+hiRJlbazbw6nmX25tGLg0EaJCQ ZgrMvkkjDgTMZq4Uz2eGXbTylYAz3HGML2hVxxagoh4hmRq5SQXkvbxDp5jlc8Sb MIKy7JXXFkJsUD0p5ZnSoIpBvcJHGkmB8mi5MnPeqkcTZg86gdhhta2cwPgmR+Eo 2tnT0mzgseGOvbSG3G0uUGasb0mp3lvZgqk9hudaPL8cHHdfO04= =Alk9 -----END PGP SIGNATURE----- --=_oEKP--qZUYVZNwqdDYHNQBO--