git: d0f0e0bd741a - main - rtld: Do not install libmap.conf when installing the COMPAT32 version
Date: Wed, 13 Oct 2021 12:42:43 UTC
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