From nobody Fri Aug 12 15:07:01 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 4M46Tf0JPFz4YXCC; Fri, 12 Aug 2022 15:07:02 +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 4M46Td6vdKz3tkj; Fri, 12 Aug 2022 15:07:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660316822; 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=0hgUGtR/CpXC57tWeaBJMBzaKH/TFy91k5Ww2hRKMAE=; b=PRERtVk8kAUECqE6A8JcjvOi2OLI3TGs9KEWH8CVNdSKyYfrB7MiinyrlSAqzVKwXwo+vc SKL16F+Ke8QMLq4J7us7fDmF/ej2Uy9ibhoISTbPWfghKo/1lSpxGKoK5hNsm0G8Vu+0sE OkFE11rwMWHSvj333FjrJE+Hnaj3B0fWQGUT32Fq1N853RLVekvwZxtFquEVb5wqu0INNy 8oFjN1WjqEcNdYW5Yb0QVDZXmJBfQ7tMRIBGPoVFamn2xhmkutrrcprept7Zv0grqz4MNh UOMF1KmoS/GbWwVMAPgKJb0e3ULWRL4fSyUDDpSo8NYqayWEdC/m4kDxiv7BTw== 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 4M46Td5yDSzc4P; Fri, 12 Aug 2022 15:07:01 +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 27CF71Ef002922; Fri, 12 Aug 2022 15:07:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 27CF71NO002921; Fri, 12 Aug 2022 15:07:01 GMT (envelope-from git) Date: Fri, 12 Aug 2022 15:07:01 GMT Message-Id: <202208121507.27CF71NO002921@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: c9f9dc96d908 - stable/13 - 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/13 X-Git-Reftype: branch X-Git-Commit: c9f9dc96d9089d250f4aba9bab4d2acea9b7acf2 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660316822; 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=0hgUGtR/CpXC57tWeaBJMBzaKH/TFy91k5Ww2hRKMAE=; b=Mr6Bm44fvqLW8eugPLDb0crzM2+8neB3d4pDHPwulKnjqhM87yfqxZ8skpVwJJonnhRdmA 839iS0Feq7Wbn7Z9Qiqy723KngouMDZo6TqAPMqu8lJDI5BMlkn7aBcCxhUd6pl2GS4Bb8 5AVdV4TRfM9zJ3ECZU/ep1DE7cD/IQXqF1LytzLbrdQj8kPWRxHpMzONjYA/HrbWVWZ9th 1bffRtp86gWGz0B7qe2LI0R7akD8N8jTzT31Mvl+qgALezxqkBF5MyUMK4bztJuadM8AJU qlwy0WE2HCquqmVxFYJ/Um+TooaZJRS0sxgaHkvvkDXtZefgbADXlUY/2c4pww== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1660316822; a=rsa-sha256; cv=none; b=uVxAWdiw4JQct3oPABshRrv7fknqIS4dQ8hQEDHD1JbyXmpjFnwF9N/JOviHVnf15TomOv V0qlt+CcGUj8dteSOfARMUcPevKnOQ61DNxAF/BNWRW5crGdayhvENYDLduHLa4vwRmQF+ +Xmc/w6B8xVGATmq/h//B8N/XZlP4QwyD0dsRwHIcShHzeK77nMXUIyx7wE3UrwwYCCpia YFEWnrlm2vSqsfQBqQuAG+kmCs8ADalpqHKmdJ/t73FCqI7AD05iZ7GPqeo+TgjcR2TLam TSo9eKzjQSpez8Qry7gxmR4/R1691zTLW49D7SMbmz9BvydLBw/gXxDlVdfBOQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=c9f9dc96d9089d250f4aba9bab4d2acea9b7acf2 commit c9f9dc96d9089d250f4aba9bab4d2acea9b7acf2 Author: Brooks Davis AuthorDate: 2022-07-01 07:33:16 +0000 Commit: Brooks Davis CommitDate: 2022-08-12 15:06:26 +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 ab9510094049..3b63c6f85ffc 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -1380,12 +1380,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; \