From nobody Fri Aug 12 22:31:27 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 4M4JLS1k70z4YV07; Fri, 12 Aug 2022 22:31:28 +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 4M4JLS1Jwsz4Fgt; Fri, 12 Aug 2022 22:31:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660343488; 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=Ao8Ds5P9wUxZRCYZIHTLm+3Efi8tGjjmPq69btLdVX0=; b=IvxIUcsxj5SHax3ob6wG5pnkApDOKDc6cEzK6/zcCzGA8KrYwMLMjScv+Gr8dE7eZ8vuxE l9hHnsNuuE78kz44iut49TuOXANOLRUXnIZgxkRrvDKZg0bmQMGumLZsG5/A49rh7qxuh/ pUJRXpIcQ8Mv0LSwrq5zst5AHAu5AHbD7F9DJRjz0PEXxAVNr+/iwFuVQ+KSKPx18wKX6W rr9ikHorUK8l42z7laeENO0Yz7jXqUPMTgbJseTrUarCN2snoi0U+tT7b2RShTI5AHKo99 mQ2OLrOOgJd3wNTmYhXHPNllBdLURZQxf6d3Z596Te+kdV9/Z4phV5a4RJWl1Q== 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 4M4JLS0Mf3zpGX; Fri, 12 Aug 2022 22:31:28 +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 27CMVRuJ007881; Fri, 12 Aug 2022 22:31:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 27CMVR6s007880; Fri, 12 Aug 2022 22:31:27 GMT (envelope-from git) Date: Fri, 12 Aug 2022 22:31:27 GMT Message-Id: <202208122231.27CMVR6s007880@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Brooks Davis Subject: git: fe89e1a629db - stable/12 - 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/stable/12 X-Git-Reftype: branch X-Git-Commit: fe89e1a629db8a4ad42d0ecb5b85b1d2b87dbf5a Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660343488; 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=Ao8Ds5P9wUxZRCYZIHTLm+3Efi8tGjjmPq69btLdVX0=; b=BHw/5YuydBmsABL3VP09hMKOWDVuGBwtzV+T8i7fdSyhtHR9xZj3mPAFpJ8dR6+qGUIT65 DPOeOm/ajfYddW8NXm465g3TQRKToH0hE81jw60rYRaPcZ4XSIVUvRRcK9pG/ipjjgko/I rJyo2qATkzc2TSbVZoCpdamQ7TilWa+m7wgrRyGKlZycR2NCqRDaDJ/8tHyLyJUv5SIuO7 boOBYTJxTbUW/LIqXcWhfBl1AHj3A+074TWwgS7MWD1kE78Y0SAo+sTjXxfwH8zL6sAV0U wOFCo0Hkwp16Jfi8lL7fDKOTsInCyk3UVu+RtGHq39InzEbPRS0WIV93wGnn6A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1660343488; a=rsa-sha256; cv=none; b=NpkOIlYX6oOwMBo3eP57m8SjRCZc54xI/mChh4cTT+KcOEm77X92xwrtAjnGgCC/jjByfO pWkx5Tlfp+SrUBF3ADNLtEsg1T8FQZ1nQLb2bl4ltKQY3cXcXPNJx6MH7gPwiUVFdLJIrT cw/ra+zlzAUrcoFTn9PE5TbVpGbRJl/dCL1W7CZKvjcmnH/4SZkOOHK6tjXVaBjzUHbsDJ rMMd/0zlFjyT/gf+18JPmkFen3+rU4l5pQYrUlnJBD6vrVbamYWBChBceLF7CsP7Lk1fbr 2e31QQgrwDXiF7XNqM97HjLrIKJChZOMniHZ1azhK2j4Ef8UHvKUo3QUuDGovA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=fe89e1a629db8a4ad42d0ecb5b85b1d2b87dbf5a commit fe89e1a629db8a4ad42d0ecb5b85b1d2b87dbf5a Author: Brooks Davis AuthorDate: 2022-07-01 07:33:16 +0000 Commit: Brooks Davis 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; \