From nobody Fri Jul 28 16:54:36 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 4RCDJT6pWCz4pL7N for ; Fri, 28 Jul 2023 16:54:49 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Received: from mail-wm1-f41.google.com (mail-wm1-f41.google.com [209.85.128.41]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RCDJT4stmz3v7j for ; Fri, 28 Jul 2023 16:54:49 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-wm1-f41.google.com with SMTP id 5b1f17b1804b1-3fbc54cab6fso23786555e9.0 for ; Fri, 28 Jul 2023 09:54:49 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690563287; x=1691168087; h=to:references:message-id:content-transfer-encoding:cc:date :in-reply-to:from:subject:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=QaloV/3NYMNfK/spocn8U/7+1J/T/JrdWmP3aouKs6I=; b=QajJvYGvZkZ9TjCOTNkwJAFwFyXJnSjSPn0RMlR+jtxD/XMn4YadDo3U/PPaSdKXe8 CaRVsT6Jdkl/U7oLX4X9/kvfdDTA3JNuo22N0lgcitddf14nj8cw2EgPrbjN+bATQXJ6 aQ+ImgU0ij8Dj9wefyHySR08BmZGoTzqqMhoDvuAqA/cMsyktEv9Ntv1qa+OMHnCa7f/ IkDpMIGZK8ElSchPVVo/sdM6Qi/jNrTVXQd6RHX5ZxIoSp3/ALGUldZRwXQP/jbBvn9D japenulogsmOK6b6xYd8Bc9reUZDNcy+EpCgjB7v8LtBobEZ/wAT0rg2sG6C7Q6CyKy3 AC3A== X-Gm-Message-State: ABy/qLZT+i8EkEbneMtJj2UsZqixqk8ay2o2fHAKy7L1Oon0vErn/yzh f6104DAS51nb91uCdTB9KTGAsxCI3gUAWSlbpv4= X-Google-Smtp-Source: APBJJlHYs7i9llq870kyXygnIwcjBPMCtvsHJOi+q23NhssRmczkIdnLBFUSeCw3OMKn2VSPTisXeA== X-Received: by 2002:adf:fdc2:0:b0:317:690e:7b39 with SMTP id i2-20020adffdc2000000b00317690e7b39mr2128583wrs.12.1690563287445; Fri, 28 Jul 2023 09:54:47 -0700 (PDT) Received: from smtpclient.apple ([131.111.5.246]) by smtp.gmail.com with ESMTPSA id h18-20020adff192000000b003113ed02080sm5154937wro.95.2023.07.28.09.54.46 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 28 Jul 2023 09:54:47 -0700 (PDT) Content-Type: text/plain; charset=utf-8 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 (Mac OS X Mail 16.0 \(3731.600.7\)) Subject: Re: git: 87177389b75d - main - bsd.lib.mk: Automatically generate libcompat TAGS From: Jessica Clarke In-Reply-To: Date: Fri, 28 Jul 2023 17:54:36 +0100 Cc: src-committers , dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Transfer-Encoding: quoted-printable Message-Id: References: <202307270411.36R4BwXG097599@gitrepo.freebsd.org> To: Dmitry Chagin X-Mailer: Apple Mail (2.3731.600.7) X-Rspamd-Queue-Id: 4RCDJT4stmz3v7j X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated On 28 Jul 2023, at 12:09, Dmitry Chagin 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 >> AuthorDate: 2023-07-27 04:10:46 +0000 >> Commit: Jessica Clarke >> 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 >> .include >> .include >> +.include >>=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 >> ____: >>=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*}