Date: Mon, 9 Dec 2024 21:49:00 GMT From: Brooks Davis <brooks@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: 6608a478cddb - stable/13 - depend-cleanup.sh: Extend clean_dep to support a custom regex Message-ID: <202412092149.4B9Ln0Cw033331@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch stable/13 has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=6608a478cddb98c1ad52ec0abae5240915fb2c57 commit 6608a478cddb98c1ad52ec0abae5240915fb2c57 Author: Jessica Clarke <jrtc27@FreeBSD.org> AuthorDate: 2024-09-10 17:54:44 +0000 Commit: Brooks Davis <brooks@FreeBSD.org> CommitDate: 2024-12-09 21:47:08 +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) Pull Request: https://github.com/freebsd/freebsd-src/pull/1543 --- 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 22baf65517fe..c12c8e203324 100755 --- a/tools/build/depend-cleanup.sh +++ b/tools/build/depend-cleanup.sh @@ -88,11 +88,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.* \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202412092149.4B9Ln0Cw033331>