git: 68cda3edb675 - releng/13.0 - rtld: Do not install libmap.conf when installing the COMPAT32 version
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 10 Jan 2022 10:13:35 UTC
The branch releng/13.0 has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=68cda3edb6758015ff888bd288ce177a7ccec805 commit 68cda3edb6758015ff888bd288ce177a7ccec805 Author: Emmanuel Vadot <manu@FreeBSD.org> AuthorDate: 2021-10-13 12:40:26 +0000 Commit: Emmanuel Vadot <manu@FreeBSD.org> CommitDate: 2022-01-10 08:16:36 +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. Approved by: so (markj@) MFC after: 1 week Sponsored by: Beckhoff Automation GmbH & Co. KG (cherry picked from commit d0f0e0bd741af867582ceede8ac1b0aec90eae2d) --- libexec/rtld-elf/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libexec/rtld-elf/Makefile b/libexec/rtld-elf/Makefile index 9ae998942a12..b8354e1b6f2d 100644 --- a/libexec/rtld-elf/Makefile +++ b/libexec/rtld-elf/Makefile @@ -11,7 +11,9 @@ PACKAGE= clibs MK_PIE= no # Always position independent using local rules MK_SSP= no +.if !defined(NEED_COMPAT) CONFS= libmap.conf +.endif PROG?= ld-elf.so.1 .if (${PROG:M*ld-elf32*} != "") TAGS+= lib32