The branch stable/12 has been updated by emaste:
URL:
https://cgit.FreeBSD.org/src/commit/?id=645427e7951f831bfdb0ac9cda74dc77da20eb21
commit 645427e7951f831bfdb0ac9cda74dc77da20eb21
Author: Ed Maste <ema...@freebsd.org>
AuthorDate: 2022-04-01 13:58:47 +0000
Commit: Ed Maste <ema...@freebsd.org>
CommitDate: 2022-04-04 00:46:34 +0000
installworld: handle ldd including preloaded objects
The installworld target makes a temporary copy of binaries to be used
during the install. Libraries that they depend on are also included,
found by using `ldd`.
After commit 0913953c9ed0 ldd started listing preloaded objects,
including [vdso], under a [preloaded] header. Skip ldd output that is
enclosed in square brackets.
Reviewed by: cy, kib [earlier version]
MFC after: 3 days
Sponsored by: The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D34734
(cherry picked from commit b3b462229f972e2ed24d450d7d2f8855cdd58a87)
---
Makefile.inc1 | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/Makefile.inc1 b/Makefile.inc1
index c9777d1d45d3..a714302a5744 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -1376,6 +1376,10 @@ distributeworld installworld stageworld:
_installcheck_world .PHONY
done); \
libs=$$(ldd -f "%o %p\n" -f "%o %p\n" $$progs 2>/dev/null | sort -u | \
while read line; do \
+ case $$line in \
+ "["*"]") \
+ continue;; \
+ esac; \
set -- $$line; \
if [ "$$2 $$3" != "not found" ]; then \
echo $$2; \
