Re: git: d0f0e0bd741a - main - rtld: Do not install libmap.conf when installing the COMPAT32 version

On Wed, 13 Oct 2021 19:07:00 +0300
Konstantin Belousov <kostikbel@gmail.com> 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 <manu@FreeBSD.org>
> > AuthorDate: 2021-10-13 12:40:26 +0000
> > Commit:     Emmanuel Vadot <manu@FreeBSD.org>
> > 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 <manu@bidouilliste.com> <manu@FreeBSD.org>