Date: Fri, 28 Jul 2023 17:54:36 +0100 From: Jessica Clarke <jrtc27@freebsd.org> To: Dmitry Chagin <dchagin@freebsd.org> Cc: src-committers <src-committers@freebsd.org>, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 87177389b75d - main - bsd.lib.mk: Automatically generate libcompat TAGS Message-ID: <CEAB93D8-B45F-4B19-9449-2FDDA842ADD5@freebsd.org> In-Reply-To: <ZMOh_tp07wBoYKvS@heemeyer.club> References: <202307270411.36R4BwXG097599@gitrepo.freebsd.org> <ZMOh_tp07wBoYKvS@heemeyer.club>
next in thread | previous in thread | raw e-mail | index | archive | help
On 28 Jul 2023, at 12:09, Dmitry Chagin <dchagin@freebsd.org> wrote: >=20 > On Thu, Jul 27, 2023 at 04:11:58AM +0000, Jessica Clarke wrote: >> The branch main has been updated by jrtc27: >>=20 >> URL: = https://cgit.FreeBSD.org/src/commit/?id=3D87177389b75d93618faa9a64ec29c16b= 53f09129 >>=20 >> commit 87177389b75d93618faa9a64ec29c16b53f09129 >> Author: Jessica Clarke <jrtc27@FreeBSD.org> >> AuthorDate: 2023-07-27 04:10:46 +0000 >> Commit: Jessica Clarke <jrtc27@FreeBSD.org> >> CommitDate: 2023-07-27 04:10:46 +0000 >>=20 >> bsd.lib.mk: Automatically generate libcompat TAGS >>=20 >> Note that the pattern for matching is made slightly more specific, = so as >> to permit libcompats where one is a prefix of another (e.g. = CheriBSD has >> lib64 and lib64c). >>=20 >> Reviewed by: brooks, jhb, emaste >> Differential Revision: https://reviews.freebsd.org/D41185 >> --- >> share/mk/bsd.lib.mk | 7 +++++-- >> 1 file changed, 5 insertions(+), 2 deletions(-) >>=20 >> diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk >> index a58114af43c4..4e653a7bcb20 100644 >> --- a/share/mk/bsd.lib.mk >> +++ b/share/mk/bsd.lib.mk >> @@ -5,6 +5,7 @@ >> .include <bsd.init.mk> >> .include <bsd.compiler.mk> >> .include <bsd.linker.mk> >> +.include <bsd.compat.pre.mk> >>=20 > Hi, Jess, > it seems bsd.compat.pre.mk is not installed during install >=20 > dchagin@mordor:~/wait/vm/tst/dso % make > make: "/usr/share/mk/bsd.lib.mk" line 8: Could not find > bsd.compat.pre.mk > make: Fatal errors encountered -- cannot continue > make: stopped in /home/dchagin/wait/vm/tst/dso Huh, I didn=E2=80=99t realise we had a separate list, odd it=E2=80=99s = not just *.mk like for sys/machine/include. Fix should now be pushed. Thanks, Jess >> __<bsd.lib.mk>__: >>=20 >> @@ -64,9 +65,11 @@ CTFFLAGS+=3D -g >> STRIP?=3D -s >> .endif >>=20 >> -.if ${SHLIBDIR:M*lib32*} >> -TAGS+=3D lib32 >> +.for _libcompat in ${_ALL_libcompats} >> +.if ${SHLIBDIR:M*/lib${_libcompat}} || = ${SHLIBDIR:M*/lib${_libcompat}/*} >> +TAGS+=3D lib${_libcompat} >> .endif >> +.endfor >>=20 >> .if defined(NO_ROOT) >> .if !defined(TAGS) || ! ${TAGS:Mpackage=3D*}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CEAB93D8-B45F-4B19-9449-2FDDA842ADD5>