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 b175379b7acc3a1eb9085fb4cdfff959d0a3d25f..4561ab4b942bf11dd26c2ad5e5462ecdceaec332 100644 (file)
--- 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 a89f2e25248b2e3674e19e665f69f948fb59ad41..a82afdfea3c599e74f49d3564f373ba11231f804 100644 (file)
--- 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)