From: Michał Górny <mgorny@gentoo.org>
Date: Tue, 28 Jun 2011 08:10:36 +0000 (+0200)
Subject: Don't ever recreate root .so links on env-update.
X-Git-Tag: v2.2.0_alpha42~21
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e1347f9c0dd5ef5ff1a50d6b136b0648efb8a6ca;p=portage.git

Don't ever recreate root .so links on env-update.

We install .so symlinks with packages, so let's use that instead of
letting ldconfig update them for no reason. This should fix problems
with preserved-libs.
---

diff --git a/man/env-update.1 b/man/env-update.1
index b175379b7..4561ab4b9 100644
--- a/man/env-update.1
+++ b/man/env-update.1
@@ -17,8 +17,7 @@ first.
 .SH OPTIONS 
 .TP
 .B \-\-no\-ldconfig
-Do not run ldconfig (and thus skip rebuilding the ldso cache, updating the 
-links in library paths, etc...).
+Do not run ldconfig (and thus skip rebuilding the ld.so cache, etc...).
 .SH "REPORTING BUGS"
 Please report bugs via http://bugs.gentoo.org/
 .SH AUTHORS
diff --git a/pym/portage/util/env_update.py b/pym/portage/util/env_update.py
index a89f2e252..a82afdfea 100644
--- a/pym/portage/util/env_update.py
+++ b/pym/portage/util/env_update.py
@@ -248,10 +248,7 @@ def env_update(makelinks=1, target_root=None, prev_mtimes=None, contents=None,
 			# we can safely create links.
 			writemsg_level(_(">>> Regenerating %setc/ld.so.cache...\n") % \
 				(target_root,))
-			if makelinks:
-				os.system("cd / ; %s -r '%s'" % (ldconfig, target_root))
-			else:
-				os.system("cd / ; %s -X -r '%s'" % (ldconfig, target_root))
+			os.system("cd / ; %s -X -r '%s'" % (ldconfig, target_root))
 		elif ostype in ("FreeBSD","DragonFly"):
 			writemsg_level(_(">>> Regenerating %svar/run/ld-elf.so.hints...\n") % \
 				target_root)