From nobody Wed Oct 13 16:18:28 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 F084C1803A35; Wed, 13 Oct 2021 16:18:35 +0000 (UTC) (envelope-from manu@bidouilliste.com) Received: from mx.blih.net (mail.blih.net [212.83.155.74]) (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 (2048 bits) client-digest SHA256) (Client CN "mx.blih.net", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4HTyQ32nwwz4rnP; Wed, 13 Oct 2021 16:18:35 +0000 (UTC) (envelope-from manu@bidouilliste.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bidouilliste.com; s=mx; t=1634141908; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=/ImjhhFoIgXbbUdAhRdq3B3N/OVRYMni3UkDiElzPqY=; b=opwVU1VXksOjVTKiG7h1FNEq40LX/APIzEmuHR+KUjjqJg5swKlofscO2+rpBk53ryekHW WxGsGFNkzlZeERaHHxD7ZwKnWv3/fE33xx0FWelvpxG8rcMWSKNVOHMzHC7nkCS188Eoij Mf4NatDVt5s7r0nDV2oEs+6DkEMCy/I= Received: from amy (lfbn-idf2-1-644-191.w86-247.abo.wanadoo.fr [86.247.100.191]) by mx.blih.net (OpenSMTPD) with ESMTPSA id f32b7d0b (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Wed, 13 Oct 2021 16:18:28 +0000 (UTC) Date: Wed, 13 Oct 2021 18:18:28 +0200 From: Emmanuel Vadot To: Konstantin Belousov Cc: Emmanuel Vadot , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: d0f0e0bd741a - main - rtld: Do not install libmap.conf when installing the COMPAT32 version Message-Id: <20211013181828.36426fe37f41cebbd3a381d5@bidouilliste.com> In-Reply-To: References: <202110131242.19DCghdV036911@gitrepo.freebsd.org> X-Mailer: Sylpheed 3.7.0 (GTK+ 2.24.33; amd64-portbld-freebsd14.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 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 4HTyQ32nwwz4rnP X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] X-ThisMailContainsUnwantedMimeParts: N 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 ? -- Emmanuel Vadot