From nobody Wed Oct 13 18:18:43 2021 X-Original-To: dev-commits-src-main@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 1CF9C17F7469; Wed, 13 Oct 2021 18:18:45 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (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-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4HV14j04GZz4V8p; Wed, 13 Oct 2021 18:18:45 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from John-Baldwins-MacBook-Pro.local (ralph.baldwin.cx [66.234.199.215]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client did not present a certificate) (Authenticated sender: jhb) by smtp.freebsd.org (Postfix) with ESMTPSA id 372D529987; Wed, 13 Oct 2021 18:18:44 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Subject: Re: git: d0f0e0bd741a - main - rtld: Do not install libmap.conf when installing the COMPAT32 version To: Konstantin Belousov , Emmanuel Vadot Cc: Emmanuel Vadot , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org References: <202110131242.19DCghdV036911@gitrepo.freebsd.org> <20211013181828.36426fe37f41cebbd3a381d5@bidouilliste.com> From: John Baldwin Message-ID: Date: Wed, 13 Oct 2021 11:18:43 -0700 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.14; rv:78.0) Gecko/20100101 Thunderbird/78.14.0 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-ThisMailContainsUnwantedMimeParts: N On 10/13/21 9:22 AM, Konstantin Belousov wrote: > On Wed, Oct 13, 2021 at 06:18:28PM +0200, Emmanuel Vadot wrote: >> On Wed, 13 Oct 2021 19:07:00 +0300 >> Konstantin Belousov wrote: >> >>> On Wed, Oct 13, 2021 at 12:42:43PM +0000, Emmanuel Vadot wrote: >>>> The branch main has been updated by manu: >>>> >>>> URL: https://cgit.FreeBSD.org/src/commit/?id=d0f0e0bd741af867582ceede8ac1b0aec90eae2d >>>> >>>> commit d0f0e0bd741af867582ceede8ac1b0aec90eae2d >>>> Author: Emmanuel Vadot >>>> AuthorDate: 2021-10-13 12:40:26 +0000 >>>> Commit: Emmanuel Vadot >>>> CommitDate: 2021-10-13 12:42:08 +0000 >>>> >>>> rtld: Do not install libmap.conf when installing the COMPAT32 version >>>> >>>> This has the effect of installing the same file twice at the same location >>>> and confuse pkgbase as we add this file twice in the package config part. >>>> >>>> MFC after: 1 week >>>> Sponsored by: Beckhoff Automation GmbH & Co. KG >>>> --- >>>> libexec/rtld-elf/Makefile | 2 ++ >>>> 1 file changed, 2 insertions(+) >>>> >>>> diff --git a/libexec/rtld-elf/Makefile b/libexec/rtld-elf/Makefile >>>> index db1bf70ca59e..1f3df176992a 100644 >>>> --- a/libexec/rtld-elf/Makefile >>>> +++ b/libexec/rtld-elf/Makefile >>>> @@ -14,7 +14,9 @@ MK_ASAN= no >>>> MK_SSP= no >>>> MK_UBSAN= no >>>> >>>> +.if !defined(NEED_COMPAT) >>>> CONFS= libmap.conf >>>> +.endif >>>> PROG?= ld-elf.so.1 >>>> .if (${PROG:M*ld-elf32*} != "") >>>> TAGS+= lib32 >>> >>> ld-elf32.so.1 tries to read /etc/libmap32.conf AFAIR. >>> I think the Makefile should install the file under that name, for compat. >> >> Indeed it does, but since this file just include the ones >> in /usr/local/etc/libmap.d regardless of the arch that could cause >> problems to have the same content no ? > > Perhaps arrange libmap32.conf to include libmap32.d? It is fine to have > libmap32.conf in rtld-elf if needed. It could even live in rtld-elf32 I think? I would vote for having a dedicated libmap32.conf that gets installed that is suitably converted to lib32. -- John Baldwin