From nobody Fri Dec 13 21:05:08 2024 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 4Y920j0kf5z5g7Lt; Fri, 13 Dec 2024 21:05:09 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y920h75Rpz4XYK; Fri, 13 Dec 2024 21:05:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734123909; 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=FJ0Q5Qx3ksV1Ni2qyM0hla0YCfTEi+t5TdpYOztW0Fs=; b=GmNsdWBUpt3xW2TIt/afevTO+5J07Z5ZsnSTPLwBi9YwnyHlFXYpN5EFf7bEb/K3gc6WLE 7onJIbv92G3ICT8nz3YeqaJ9tp6EhjK17VEvYG23fxa57lHERjN6UXkVe/6FGLCIPIdL63 3JYDkVE0fuadzLggWNSjRbQ4tFlQAqx3xDZQ2kpCapQ60Y8NhoMX2AET/NjSQ71Lt1Oeah qHmqqQBfAVgOAN450zvzLoEpCamsNss/m5tlXTuIdRD087uF7fzq0BKI6L60GtxtTKueCs cmN1Rrr2iArLqSZF66RVRDO5phFQgCZJx1nOjSfivjLw51E8nBwcKGyUz8WAoQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734123909; 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=FJ0Q5Qx3ksV1Ni2qyM0hla0YCfTEi+t5TdpYOztW0Fs=; b=IixpgNvIbTrmaLOBzfnUkMuHfPdCkKOdDPx0A7ftd5sGYswZOkGb7VTvQtbbXXUN1WTet5 Lm0NTIg9oewRuB3lt0+wvBLSvY1BTPZFA5ILKMylV7xeT3aRApC6bTUvx+Zn8n+Q3gOk6d QIj2boNqsG+5paU016ebSEbJ4APnUWJUnCiZ5L6uuqA1n2Yw1LK5t1mO+9sKFn22Hvt7vs AAaexmyKsY0TXLfL7CsQ6lO5s55S6+hS/R4x3lw3YNZS+rSc71DP6ihxc2LkBpfF/xtDh+ ipYIrevpgNW1PXIF8mYWYQjjcmjJ8h6qSpqW12PPsgDyCBM4ZVSlgs5B5m7Tdw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734123909; a=rsa-sha256; cv=none; b=LQ+RrlMc2Xikd5RNSUQOZKkdZxitPQa+qHrsvMndbDXx/uj2zmw1fbKlkcluQxRQRPMzPD zmXt6W1k3H0lcHxy8FKdTsg6LBcU5fbCYLAY+cz+Es7amaYIvuIQTBdRduez+uSSSb9kQq pO+pRs9dvb+/Re5iRW6FWc7oc013P8fr4+4Pr7SZvCoROWkPG1NXPRhEEmeJIZQWnaT242 t+3qUXBzZ0DolT6aJD7kP5/W6K3I6gYV32pGkrVKIuQVZZXC7HRYVFw3o1jPIgKSIt6S91 bIC5HhyUfkpwYevtk438VlszobiVzNcmcYswJx9uXe0BlFXBEFc92ofJajXIeQ== 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 4Y920h6jPSzt5M; Fri, 13 Dec 2024 21:05:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4BDL58aZ005384; Fri, 13 Dec 2024 21:05:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BDL58wO005381; Fri, 13 Dec 2024 21:05:08 GMT (envelope-from git) Date: Fri, 13 Dec 2024 21:05:08 GMT Message-Id: <202412132105.4BDL58wO005381@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Brooks Davis Subject: git: f69b6410a632 - stable/14 - depend-cleanup.sh: Extend clean_dep to support a custom regex 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: f69b6410a632655896a4c31280604c4af5f1a4ed Auto-Submitted: auto-generated The branch stable/14 has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=f69b6410a632655896a4c31280604c4af5f1a4ed commit f69b6410a632655896a4c31280604c4af5f1a4ed Author: Jessica Clarke AuthorDate: 2024-09-10 17:54:44 +0000 Commit: Brooks Davis CommitDate: 2024-12-13 20:58:38 +0000 depend-cleanup.sh: Extend clean_dep to support a custom regex This will avoid having to duplicate the loop every time the default regex isn't good enough, and will be used by upcoming commits. (cherry picked from commit cc30f4ae6790cf4f19bc4787d7528dfea79ef27a) --- tools/build/depend-cleanup.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/build/depend-cleanup.sh b/tools/build/depend-cleanup.sh index a4d367d7c463..c560a079f43c 100755 --- a/tools/build/depend-cleanup.sh +++ b/tools/build/depend-cleanup.sh @@ -89,11 +89,12 @@ run() # $1 directory # $2 source filename w/o extension # $3 source extension +# $4 optional regex for egrep -w clean_dep() { for libcompat in "" $ALL_libcompats; do dirprfx=${libcompat:+obj-lib${libcompat}/} - if egrep -qw "$2\.$3" "$OBJTOP"/$dirprfx$1/.depend.$2.*o 2>/dev/null; then + if egrep -qw "${4:-$2\.$3}" "$OBJTOP"/$dirprfx$1/.depend.$2.*o 2>/dev/null; then echo "Removing stale ${libcompat:+lib${libcompat} }dependencies and objects for $2.$3" run rm -f \ "$OBJTOP"/$dirprfx$1/.depend.$2.* \