Date: Sun, 14 Jan 2024 19:28:39 -0700 From: Warner Losh <imp@bsdimp.com> To: Warner Losh <imp@freebsd.org> Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 3d939d967ad4 - main - build: Use ls -i | cut rather than stat -f %i to extract inode Message-ID: <CANCZdfpp97U=sU=mzM7JDwBOt2GEwZE5csMieMW0a9QbOmWu6g@mail.gmail.com> In-Reply-To: <202401150224.40F2OR6f093484@gitrepo.freebsd.org> References: <202401150224.40F2OR6f093484@gitrepo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
[-- Attachment #1 --] On Sun, Jan 14, 2024 at 7:24 PM Warner Losh <imp@freebsd.org> wrote: > The branch main has been updated by imp: > > URL: > https://cgit.FreeBSD.org/src/commit/?id=3d939d967ad49f747b8b9db4fdec8086a7067582 > > commit 3d939d967ad49f747b8b9db4fdec8086a7067582 > Author: Warner Losh <imp@FreeBSD.org> > AuthorDate: 2023-05-02 20:51:09 +0000 > Commit: Warner Losh <imp@FreeBSD.org> > CommitDate: 2024-01-15 02:23:45 +0000 > > build: Use ls -i | cut rather than stat -f %i to extract inode > > ls -i dates back to 5th edition Unix and is more portable than the stat > command, though %% is a newer shellism, it works on any shell that > FreeBSD builds with. > > Sponsored by: Netflix > Reviewed by: arichardson Differential Revision: https://reviews.freebsd.org/D43443 Warner --- > Makefile.inc1 | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/Makefile.inc1 b/Makefile.inc1 > index 34b49ee319ec..8a0073547ed0 100644 > --- a/Makefile.inc1 > +++ b/Makefile.inc1 > @@ -1059,8 +1059,8 @@ _cleanworldtmp: .PHONY > .if ${USING_SYSTEM_COMPILER} == "yes" > .for cc in cc c++ > if [ -x ${WORLDTMP}/usr/bin/${cc} ]; then \ > - inum=$$(stat -f %i ${WORLDTMP}/usr/bin/${cc}); \ > - find ${WORLDTMP}/usr/bin -inum $${inum} -delete; \ > + inum=$$(ls -i ${WORLDTMP}/usr/bin/${cc}); \ > + find ${WORLDTMP}/usr/bin -inum $${inum%% *} -delete; \ > fi > .endfor > .endif # ${USING_SYSTEM_COMPILER} == "yes" > [-- Attachment #2 --] <div dir="ltr"><div dir="ltr"><br></div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Sun, Jan 14, 2024 at 7:24 PM Warner Losh <<a href="mailto:imp@freebsd.org">imp@freebsd.org</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">The branch main has been updated by imp:<br> <br> URL: <a href="https://cgit.FreeBSD.org/src/commit/?id=3d939d967ad49f747b8b9db4fdec8086a7067582" rel="noreferrer" target="_blank">https://cgit.FreeBSD.org/src/commit/?id=3d939d967ad49f747b8b9db4fdec8086a7067582</a><br>; <br> commit 3d939d967ad49f747b8b9db4fdec8086a7067582<br> Author: Warner Losh <imp@FreeBSD.org><br> AuthorDate: 2023-05-02 20:51:09 +0000<br> Commit: Warner Losh <imp@FreeBSD.org><br> CommitDate: 2024-01-15 02:23:45 +0000<br> <br> build: Use ls -i | cut rather than stat -f %i to extract inode<br> <br> ls -i dates back to 5th edition Unix and is more portable than the stat<br> command, though %% is a newer shellism, it works on any shell that<br> FreeBSD builds with.<br> <br> Sponsored by: Netflix<br></blockquote><div><br></div><div>Reviewed by: arichardson</div><div>Differential Revision: <a href="https://reviews.freebsd.org/D43443">https://reviews.freebsd.org/D43443</a></div><div><br></div><div>Warner<br></div><div><br>; </div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"> ---<br> Makefile.inc1 | 4 ++--<br> 1 file changed, 2 insertions(+), 2 deletions(-)<br> <br> diff --git a/Makefile.inc1 b/Makefile.inc1<br> index 34b49ee319ec..8a0073547ed0 100644<br> --- a/Makefile.inc1<br> +++ b/Makefile.inc1<br> @@ -1059,8 +1059,8 @@ _cleanworldtmp: .PHONY<br> .if ${USING_SYSTEM_COMPILER} == "yes"<br> .for cc in cc c++<br> if [ -x ${WORLDTMP}/usr/bin/${cc} ]; then \<br> - inum=$$(stat -f %i ${WORLDTMP}/usr/bin/${cc}); \<br> - find ${WORLDTMP}/usr/bin -inum $${inum} -delete; \<br> + inum=$$(ls -i ${WORLDTMP}/usr/bin/${cc}); \<br> + find ${WORLDTMP}/usr/bin -inum $${inum%% *} -delete; \<br> fi<br> .endfor<br> .endif # ${USING_SYSTEM_COMPILER} == "yes"<br> </blockquote></div></div>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CANCZdfpp97U=sU=mzM7JDwBOt2GEwZE5csMieMW0a9QbOmWu6g>