Date: Fri, 28 Jul 2023 14:09:50 +0300 From: Dmitry Chagin <dchagin@freebsd.org> To: Jessica Clarke <jrtc27@freebsd.org> Cc: 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: <ZMOh_tp07wBoYKvS@heemeyer.club> In-Reply-To: <202307270411.36R4BwXG097599@gitrepo.freebsd.org> References: <202307270411.36R4BwXG097599@gitrepo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On Thu, Jul 27, 2023 at 04:11:58AM +0000, Jessica Clarke wrote: > The branch main has been updated by jrtc27: > > URL: https://cgit.FreeBSD.org/src/commit/?id=87177389b75d93618faa9a64ec29c16b53f09129 > > 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 > > bsd.lib.mk: Automatically generate libcompat TAGS > > 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). > > 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(-) > > 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> > Hi, Jess, it seems bsd.compat.pre.mk is not installed during install 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 > __<bsd.lib.mk>__: > > @@ -64,9 +65,11 @@ CTFFLAGS+= -g > STRIP?= -s > .endif > > -.if ${SHLIBDIR:M*lib32*} > -TAGS+= lib32 > +.for _libcompat in ${_ALL_libcompats} > +.if ${SHLIBDIR:M*/lib${_libcompat}} || ${SHLIBDIR:M*/lib${_libcompat}/*} > +TAGS+= lib${_libcompat} > .endif > +.endfor > > .if defined(NO_ROOT) > .if !defined(TAGS) || ! ${TAGS:Mpackage=*}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?ZMOh_tp07wBoYKvS>