From nobody Fri Jul 28 11:09:50 2023 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 4RC4fb4cZYz4p79w; Fri, 28 Jul 2023 11:09:59 +0000 (UTC) (envelope-from dchagin@heemeyer.club) Received: from heemeyer.club (heemeyer.club [195.93.173.158]) (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 mx1.freebsd.org (Postfix) with ESMTPS id 4RC4fZ3cm1z3NFd; Fri, 28 Jul 2023 11:09:58 +0000 (UTC) (envelope-from dchagin@heemeyer.club) Authentication-Results: mx1.freebsd.org; dkim=none; spf=none (mx1.freebsd.org: domain of dchagin@heemeyer.club has no SPF policy when checking 195.93.173.158) smtp.mailfrom=dchagin@heemeyer.club; dmarc=none Received: from heemeyer.club (localhost [127.0.0.1]) by heemeyer.club (8.17.2/8.16.1) with ESMTP id 36SB9ohU000826; Fri, 28 Jul 2023 14:09:50 +0300 (MSK) (envelope-from dchagin@heemeyer.club) Received: (from dchagin@localhost) by heemeyer.club (8.17.2/8.16.1/Submit) id 36SB9oWC000825; Fri, 28 Jul 2023 14:09:50 +0300 (MSK) (envelope-from dchagin) Date: Fri, 28 Jul 2023 14:09:50 +0300 From: Dmitry Chagin To: Jessica Clarke 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: References: <202307270411.36R4BwXG097599@gitrepo.freebsd.org> 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <202307270411.36R4BwXG097599@gitrepo.freebsd.org> X-Spamd-Result: default: False [-1.80 / 15.00]; NEURAL_HAM_LONG(-1.00)[-1.000]; AUTH_NA(1.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_SHORT(-1.00)[-0.999]; FORGED_SENDER(0.30)[dchagin@freebsd.org,dchagin@heemeyer.club]; MIME_GOOD(-0.10)[text/plain]; BLOCKLISTDE_FAIL(0.00)[195.93.173.158:server fail]; MLMMJ_DEST(0.00)[dev-commits-src-all@freebsd.org,dev-commits-src-main@freebsd.org]; R_DKIM_NA(0.00)[]; R_SPF_NA(0.00)[no SPF record]; MIME_TRACE(0.00)[0:+]; RCVD_COUNT_THREE(0.00)[3]; RCVD_TLS_LAST(0.00)[]; DMARC_NA(0.00)[freebsd.org]; FREEFALL_USER(0.00)[dchagin]; ARC_NA(0.00)[]; ASN(0.00)[asn:61400, ipnet:195.93.173.0/24, country:RU]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; TO_MATCH_ENVRCPT_ALL(0.00)[]; FROM_NEQ_ENVFROM(0.00)[dchagin@freebsd.org,dchagin@heemeyer.club] X-Rspamd-Queue-Id: 4RC4fZ3cm1z3NFd X-Spamd-Bar: - 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 > AuthorDate: 2023-07-27 04:10:46 +0000 > Commit: Jessica Clarke > 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 > .include > .include > +.include > 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 > ____: > > @@ -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=*}