From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 9BA07138CEA for ; Sun, 14 Jun 2015 17:37:53 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3B02BE081D; Sun, 14 Jun 2015 17:37:53 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E2647E081D for ; Sun, 14 Jun 2015 17:37:52 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id DAA0D34096D for ; Sun, 14 Jun 2015 17:37:51 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 89315A32 for ; Sun, 14 Jun 2015 17:37:50 +0000 (UTC) From: "Fabian Groffen" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Fabian Groffen" Message-ID: <1434289811.dde7fb0919d40cc5585e8a603046e7098371ad69.grobian@gentoo> Subject: [gentoo-commits] proj/portage:prefix commit in: pym/portage/util/ X-VCS-Repository: proj/portage X-VCS-Files: pym/portage/util/env_update.py X-VCS-Directories: pym/portage/util/ X-VCS-Committer: grobian X-VCS-Committer-Name: Fabian Groffen X-VCS-Revision: dde7fb0919d40cc5585e8a603046e7098371ad69 X-VCS-Branch: prefix Date: Sun, 14 Jun 2015 17:37:50 +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-Archives-Salt: 46b35728-f319-454e-91af-d77331410b4a X-Archives-Hash: a266ec034ff1606e7970c4f605e14c72 commit: dde7fb0919d40cc5585e8a603046e7098371ad69 Author: Benda Xu gentoo org> AuthorDate: Wed Dec 10 01:45:31 2014 +0000 Commit: Fabian Groffen gentoo org> CommitDate: Sun Jun 14 13:50:11 2015 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=dde7fb09 let env-update call ldconfig if it exists In Prefix, let env-update call ldconfig if it exists. It does not affect prefix-rpath, and handles prefix-libc(RAP) correctly. Signed-off-by: Fabian Groffen gentoo.org> pym/portage/util/env_update.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pym/portage/util/env_update.py b/pym/portage/util/env_update.py index ace492c..5e732ad 100644 --- a/pym/portage/util/env_update.py +++ b/pym/portage/util/env_update.py @@ -306,13 +306,15 @@ def _env_update(makelinks, target_root, prev_mtimes, contents, env, if not libdir_contents_changed: makelinks = False - ldconfig = "/sbin/ldconfig" + ldconfig = eprefix + "/sbin/ldconfig" if "CHOST" in settings and "CBUILD" in settings and \ settings["CHOST"] != settings["CBUILD"]: ldconfig = find_binary("%s-ldconfig" % settings["CHOST"]) + elif not (os.access(ldconfig, os.X_OK) and os.path.isfile(ldconfig)): + ldconfig = None # Only run ldconfig as needed - if makelinks and ldconfig and not eprefix: + if makelinks and ldconfig: # ldconfig has very different behaviour between FreeBSD and Linux if ostype == "Linux" or ostype.lower().endswith("gnu"): # We can't update links if we haven't cleaned other versions first, as