| 1 |
commit: a1d16a01c4ca0b2b196e9256b4f309157c5545fd |
| 2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Jun 30 01:50:54 2011 +0000 |
| 4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Jun 30 01:50:54 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=a1d16a01 |
| 7 |
|
| 8 |
env_update: document ldconfig -X for bug #373341 |
| 9 |
|
| 10 |
--- |
| 11 |
pym/portage/util/env_update.py | 9 ++++++++- |
| 12 |
1 files changed, 8 insertions(+), 1 deletions(-) |
| 13 |
|
| 14 |
diff --git a/pym/portage/util/env_update.py b/pym/portage/util/env_update.py |
| 15 |
index a82afdf..3e295f0 100644 |
| 16 |
--- a/pym/portage/util/env_update.py |
| 17 |
+++ b/pym/portage/util/env_update.py |
| 18 |
@@ -27,7 +27,14 @@ def env_update(makelinks=1, target_root=None, prev_mtimes=None, contents=None, |
| 19 |
env=None, writemsg_level=None): |
| 20 |
""" |
| 21 |
Parse /etc/env.d and use it to generate /etc/profile.env, csh.env, |
| 22 |
- ld.so.conf, and prelink.conf. Finally, run ldconfig. |
| 23 |
+ ld.so.conf, and prelink.conf. Finally, run ldconfig. When ldconfig is |
| 24 |
+ called, its -X option will be used in order to avoid potential |
| 25 |
+ interference with installed soname symlinks that are required for |
| 26 |
+ correct operation of FEATURES=preserve-libs for downgrade operations. |
| 27 |
+ It's not necessary for ldconfig to create soname symlinks, since |
| 28 |
+ portage will use NEEDED.ELF.2 data to automatically create them |
| 29 |
+ after src_install if they happen to be missing. |
| 30 |
+ @param makelinks: True if ldconfig should be called, False otherwise |
| 31 |
@param target_root: root that is passed to the ldconfig -r option, |
| 32 |
defaults to portage.settings["ROOT"]. |
| 33 |
@type target_root: String (Path) |
Archives