[patch] portage-2.3.0-ldconfig-path.patch

portage-2.3.0-ldconfig-path.patch (text/plain), 1.45 KB, created by Benda Xu on 2017-01-07 04:00:34 UTC

commit 3d096f2f76d55cb34753619353b2398bf514cd0c
Author: Benda Xu <[e-mail]>
Date:   Mon Jun 20 09:12:35 2016 +0900

    env-update should call ldconfig if found in EROOT
    
      prefix-standalone has a glibc installed by portage with ldconfig
      under EROOT/sbin.  It should be called during env-update.
    
      For prefix-rpath, host glibc is used and env-update should not
      care about ldconfig.  In this case, no ldconfig is in EROOT/sbin
      and ldconfig is skipped.

diff --git a/pym/portage/util/env_update.py b/pym/portage/util/env_update.py
index c0a93a8..fde2f66 100644
--- a/pym/portage/util/env_update.py
+++ b/pym/portage/util/env_update.py
@@ -306,13 +306,17 @@ def _env_update(makelinks, target_root, prev_mtimes, contents, env,
 		if not libdir_contents_changed:
 			makelinks = False
 
-	ldconfig = "/sbin/ldconfig"
 	if "CHOST" in settings and "CBUILD" in settings and \
 		settings["CHOST"] != settings["CBUILD"]:
 		ldconfig = find_binary("%s-ldconfig" % settings["CHOST"])
+	else:
+		ldconfig = os.path.join(eroot, "sbin", "ldconfig")
+
+	if 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