1 |
commit: e1347f9c0dd5ef5ff1a50d6b136b0648efb8a6ca |
2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Jun 28 08:10:36 2011 +0000 |
4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Jun 29 09:29:55 2011 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=e1347f9c |
7 |
|
8 |
Don't ever recreate root .so links on env-update. |
9 |
|
10 |
We install .so symlinks with packages, so let's use that instead of |
11 |
letting ldconfig update them for no reason. This should fix problems |
12 |
with preserved-libs. |
13 |
|
14 |
--- |
15 |
man/env-update.1 | 3 +-- |
16 |
pym/portage/util/env_update.py | 5 +---- |
17 |
2 files changed, 2 insertions(+), 6 deletions(-) |
18 |
|
19 |
diff --git a/man/env-update.1 b/man/env-update.1 |
20 |
index b175379..4561ab4 100644 |
21 |
--- a/man/env-update.1 |
22 |
+++ b/man/env-update.1 |
23 |
@@ -17,8 +17,7 @@ first. |
24 |
.SH OPTIONS |
25 |
.TP |
26 |
.B \-\-no\-ldconfig |
27 |
-Do not run ldconfig (and thus skip rebuilding the ldso cache, updating the |
28 |
-links in library paths, etc...). |
29 |
+Do not run ldconfig (and thus skip rebuilding the ld.so cache, etc...). |
30 |
.SH "REPORTING BUGS" |
31 |
Please report bugs via http://bugs.gentoo.org/ |
32 |
.SH AUTHORS |
33 |
|
34 |
diff --git a/pym/portage/util/env_update.py b/pym/portage/util/env_update.py |
35 |
index a89f2e2..a82afdf 100644 |
36 |
--- a/pym/portage/util/env_update.py |
37 |
+++ b/pym/portage/util/env_update.py |
38 |
@@ -248,10 +248,7 @@ def env_update(makelinks=1, target_root=None, prev_mtimes=None, contents=None, |
39 |
# we can safely create links. |
40 |
writemsg_level(_(">>> Regenerating %setc/ld.so.cache...\n") % \ |
41 |
(target_root,)) |
42 |
- if makelinks: |
43 |
- os.system("cd / ; %s -r '%s'" % (ldconfig, target_root)) |
44 |
- else: |
45 |
- os.system("cd / ; %s -X -r '%s'" % (ldconfig, target_root)) |
46 |
+ os.system("cd / ; %s -X -r '%s'" % (ldconfig, target_root)) |
47 |
elif ostype in ("FreeBSD","DragonFly"): |
48 |
writemsg_level(_(">>> Regenerating %svar/run/ld-elf.so.hints...\n") % \ |
49 |
target_root) |