The branch stable/12 has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=fe89e1a629db8a4ad42d0ecb5b85b1d2b87dbf5a
commit fe89e1a629db8a4ad42d0ecb5b85b1d2b87dbf5a Author: Brooks Davis <[email protected]> AuthorDate: 2022-07-01 07:33:16 +0000 Commit: Brooks Davis <[email protected]> CommitDate: 2022-08-12 22:29:04 +0000 installworld: improve portability of ldd use b3b462229f97 added a case statement to ignore lines containing strings in square brackets such as "[vdso]" and "[preloaded]". On MacOS Monterey where /bin/sh may be zsh, this fails with: /bin/sh: -c: line 0: syntax error near unexpected token `;;' Invoke grep in the pipeline to remove such lines instead. Reviewed by: emaste Sponsored by: DARPA, AFRL Differential Revision: https://reviews.freebsd.org/D35618 (cherry picked from commit bda5d2a45c8dcc9bbeb71cddeef930ffa6a47f23) --- Makefile.inc1 | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index 3bfe99f2e6c3..fcffba095348 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -1374,12 +1374,8 @@ distributeworld installworld stageworld: _installcheck_world .PHONY exit 1; \ fi; \ done); \ - libs=$$(ldd -f "%o %p\n" -f "%o %p\n" $$progs 2>/dev/null | sort -u | \ + libs=$$(ldd -f "%o %p\n" -f "%o %p\n" $$progs 2>/dev/null | sort -u | grep -Ev '\[.*]' | \ while read line; do \ - case $$line in \ - "["*"]") \ - continue;; \ - esac; \ set -- $$line; \ if [ "$$2 $$3" != "not found" ]; then \ echo $$2; \
