[gentoo-commits] proj/portage:prefix commit in: pym/portage/util/

["Fabian Groffen" <grobian@gentoo.org>]

commit:     dde7fb0919d40cc5585e8a603046e7098371ad69
Author:     Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 10 01:45:31 2014 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> 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 <grobian <AT> 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