aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2011-06-28 08:10:36 (GMT)
committerZac Medico <zmedico@gentoo.org>2011-06-29 09:29:55 (GMT)
commite1347f9c0dd5ef5ff1a50d6b136b0648efb8a6ca (patch)
tree19c06a878f9cd827ef4109024f7b883420eae3d3
parentDetect/create missing soname symlinks for libs. (diff)
downloadportage-e1347f9c0dd5ef5ff1a50d6b136b0648efb8a6ca.zip
portage-e1347f9c0dd5ef5ff1a50d6b136b0648efb8a6ca.tar.gz
portage-e1347f9c0dd5ef5ff1a50d6b136b0648efb8a6ca.tar.bz2
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.
-rw-r--r--man/env-update.13
-rw-r--r--pym/portage/util/env_update.py5
2 files changed, 2 insertions, 6 deletions
diff --git a/man/env-update.1 b/man/env-update.1
index b175379..4561ab4 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 a89f2e2..a82afdf 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)