Date: Mon, 4 Apr 2022 14:59:08 GMT From: Ed Maste <emaste@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: 2a2ea0075dda - stable/11 - installworld: handle ldd including preloaded objects Message-ID: <202204041459.234Ex88a099493@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch stable/11 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=2a2ea0075dda175deef7ca02d5a5ac3838921482 commit 2a2ea0075dda175deef7ca02d5a5ac3838921482 Author: Ed Maste <emaste@FreeBSD.org> AuthorDate: 2022-04-01 13:58:47 +0000 Commit: Ed Maste <emaste@FreeBSD.org> CommitDate: 2022-04-04 14:57:48 +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) (cherry picked from commit 6550cae9b83aa12c2300727d9d4ec6cc816d664b) --- Makefile.inc1 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Makefile.inc1 b/Makefile.inc1 index 0f937ee11a30..54f037282d0e 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -1020,6 +1020,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; \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202204041459.234Ex88a099493>