Date: Mon, 11 Apr 2022 13:14:14 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: 7150099b3c84 - releng/13.1 - installworld: handle ldd including preloaded objects Message-ID: <202204111314.23BDEElA088788@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch releng/13.1 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=7150099b3c8484096ce891f30f2c6aca29cfdac7 commit 7150099b3c8484096ce891f30f2c6aca29cfdac7 Author: Ed Maste <emaste@FreeBSD.org> AuthorDate: 2022-04-01 13:58:47 +0000 Commit: Ed Maste <emaste@FreeBSD.org> CommitDate: 2022-04-11 13:12:53 +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 e10026a406b21b3f1581ee15a88def2b640dffe7) Approved by: re (gjb) --- Makefile.inc1 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Makefile.inc1 b/Makefile.inc1 index 327680cad5ff..b8431b5abe09 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -1383,6 +1383,10 @@ distributeworld installworld stageworld: _installcheck_world .PHONY if [ -z "${CROSSBUILD_HOST}" ] ; then \ 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?202204111314.23BDEElA088788>