From nobody Fri Jul 01 07:33:24 2022 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 9A4DA8B328A; Fri, 1 Jul 2022 07:33:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4LZ6Pc3yjfz4w4w; Fri, 1 Jul 2022 07:33:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656660804; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KV7td46MRyMRFYByiotJUm+xmVlE4Iz1IsEzb4o3Q78=; b=p5StOti8wbBwTxtFWv2rr0KMrztAxh3B9qMLO2b1CiSHiiEe4FUWt7d13eOUJjjf5WOlZv Jm9ybJyHioFJOzoTsl6qhjOSh6IerwGruH1C2f5WEVuj8QCEYRUymepyhq2EjtlCoWkT8x KbEEm8OzgsSsCmNynYtFb/ufULpBbXmdbuCzpMwgDNkLFLAlWY+Dav3as0fzkQQJkgTgyq 1nBEBYRAiVWfwCVIwT/UD7nyvsMY73JtGxF2XC5Si+fRHdRmVf25FdNVhz14Ij3SzSvc88 jr3fzUgBUmQLu7geML29QOBsRDMOl6ifrePDzFBz6A17r4jsF0HEUUTaoPaKfg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 6801016FD8; Fri, 1 Jul 2022 07:33:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2617XOn1059635; Fri, 1 Jul 2022 07:33:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2617XOsU059634; Fri, 1 Jul 2022 07:33:24 GMT (envelope-from git) Date: Fri, 1 Jul 2022 07:33:24 GMT Message-Id: <202207010733.2617XOsU059634@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: bda5d2a45c8d - main - installworld: improve portability of ldd use List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bda5d2a45c8dcc9bbeb71cddeef930ffa6a47f23 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656660804; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KV7td46MRyMRFYByiotJUm+xmVlE4Iz1IsEzb4o3Q78=; b=Rpra4v7LP0DLh5VnIIxv3RDXK/RiM77vrmToTuhnXI3oqTDs96C83cTOGYoHydXzlmpyTY PChSfr59BFcTYafHk2WH48wdJmrHBXPmdIQzkaaQUigK+XNOqFIbsaZI8NJDRsOvSdQhFX Y7ofEvBG3OiWRC1ecVg5CfclEEjnQ5emd/Q1MQl0G0wtrxSO9yqcmRmfpceYiVES5PnXvZ AWElYokRby0Nex+INj2Edu5BN3t6aCWdFg0tCzPYhWx9iidJK+nXyypAu9zwj7c3KE+7MP MvwHQvyUX/q3v83QBVCbuZvUDB5tPuGfxHgmYk/7PyM8n4kS91nUuXMQYenYOA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1656660804; a=rsa-sha256; cv=none; b=frX9ZsewHEARmYninBE0WmJ6t2EjdOOeRNta0FnXQ3Di6l6wugpgBtAWrirmG2f+djSHMi 8YL/qpjnEiRO9+mYyy6o4GKX+pU8U8KMRb1/AHrUI7MtVgc3134yKBQlXbgyG0XBogiOpt gt+2iTiovAGvIcsdv3LiG6pMImI+U3qWojSIBTN5Pum7sXrHSUAgIT5UyDkCCS5XR+7pa0 mk4pgRvBoofCAaiDfhw5a7an1HdNjnvK6VsSX2cdvaFjZLTlsktZiYoYnXrJKFf6U5YDim KY4hbvvktopyEauxx1bdunPpsFjqdJKqrEhvbm9W3IFhUUhtBWzianIXNi8LIQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=bda5d2a45c8dcc9bbeb71cddeef930ffa6a47f23 commit bda5d2a45c8dcc9bbeb71cddeef930ffa6a47f23 Author: Brooks Davis AuthorDate: 2022-07-01 07:33:16 +0000 Commit: Brooks Davis CommitDate: 2022-07-01 07:33:16 +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 --- Makefile.inc1 | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index 20c537512273..12bb892dfd58 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -1368,12 +1368,8 @@ distributeworld installworld stageworld: _installcheck_world .PHONY fi; \ done); \ if [ -z "${CROSSBUILD_HOST}" ] ; then \ - 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; \