From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 750B91382C5 for ; Mon, 19 Apr 2021 04:58:50 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C83FFE082B; Mon, 19 Apr 2021 04:58:49 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id AD250E082B for ; Mon, 19 Apr 2021 04:58:49 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id BCFF7340E33 for ; Mon, 19 Apr 2021 04:58:48 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 42C5059C for ; Mon, 19 Apr 2021 04:58:47 +0000 (UTC) From: "Mike Frysinger" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Frysinger" Message-ID: <1618808163.f0b893136c4b1418edadff6ff8e65afe68c3b4a8.vapier@gentoo> Subject: [gentoo-commits] proj/pax-utils:master commit in: / X-VCS-Repository: proj/pax-utils X-VCS-Files: lddtree.py X-VCS-Directories: / X-VCS-Committer: vapier X-VCS-Committer-Name: Mike Frysinger X-VCS-Revision: f0b893136c4b1418edadff6ff8e65afe68c3b4a8 X-VCS-Branch: master Date: Mon, 19 Apr 2021 04:58:47 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 461644a0-b1f7-4b9a-bfae-99c112620d8c X-Archives-Hash: 087d994ad483ebdd10084af4a71f0d67 commit: f0b893136c4b1418edadff6ff8e65afe68c3b4a8 Author: Mike Frysinger chromium org> AuthorDate: Mon Apr 19 04:56:03 2021 +0000 Commit: Mike Frysinger gentoo org> CommitDate: Mon Apr 19 04:56:03 2021 +0000 URL: https://gitweb.gentoo.org/proj/pax-utils.git/commit/?id=f0b89313 lddtree: respect (destination) root with --argv0 interp probing This is important because the path in this func reflects where the interpreter is going to be living, not where it's being copied from. These are often the same paths (relatively speaking), but when we're copying from a cross-compiler sysroot, or when using --libdir so the target paths are rewritten, the interp path probably does not line up with whatever happens to live in the active rootfs. Signed-off-by: Mike Frysinger gentoo.org> lddtree.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lddtree.py b/lddtree.py index b8fde0c..dd17387 100755 --- a/lddtree.py +++ b/lddtree.py @@ -157,7 +157,7 @@ def GenerateLdsoWrapper(root, path, interp, libpaths=()): interp_name), 'libpaths': ':'.join(['${basedir}/' + os.path.relpath(p, basedir) for p in libpaths]), - 'argv0_arg': '--argv0 "$0"' if interp_supports_argv0(interp) else '', + 'argv0_arg': '--argv0 "$0"' if interp_supports_argv0(root + interp) else '', } wrapper = """#!/bin/sh if ! base=$(realpath "$0" 2>/dev/null); then