diff options
| author |   Ulrich Müller <ulm@gentoo.org> | 2011-06-29 18:40:05 +0000 |
|---|---|---|
| committer | Ulrich Müller <ulm@gentoo.org> | 2011-06-29 18:40:05 +0000 |
| commit | 287290c85908e36885178478e5bccfc0b2624a27 (patch) | |
| tree | 9236a12c45713768d96d7f590cbb7479fbcd635f | |
| parent | env.eselect: Call ldconfig with -X to not update symlinks, bug 373343. (diff) | |
| download | eselect-287290c85908e36885178478e5bccfc0b2624a27.tar.gz eselect-287290c85908e36885178478e5bccfc0b2624a27.tar.bz2 eselect-287290c85908e36885178478e5bccfc0b2624a27.zip | |
env.eselect: Call ldconfig only for Linux/GNU and BSD systems.
svn path=/trunk/; revision=818
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | modules/env.eselect | 14 |
2 files changed, 12 insertions, 7 deletions
@@ -1,3 +1,8 @@ +2011-06-29 Ulrich Mueller <ulm@gentoo.org> + + * modules/env.eselect (update_ldcache): Call ldconfig only for + Linux/GNU and BSD systems. + 2011-06-29 Michał Górny <mgorny@gentoo.org> * modules/env.eselect (update_ldcache): Call ldconfig with '-X' to diff --git a/modules/env.eselect b/modules/env.eselect index b96044b..52863b6 100644 --- a/modules/env.eselect +++ b/modules/env.eselect @@ -218,19 +218,19 @@ create_prelink_conf() { # Update ld.so.cache using ldconfig update_ldcache() { case $(uname -s) in - FreeBSD | DragonFly) - echo "Regenerating ${ROOT}/var/run/ld-elf.so.hints..." + Linux | *GNU | *gnu) + echo "Regenerating ${ROOT}/etc/ld.so.cache..." ( cd / - ldconfig -elf -i -f "${ROOT:-/}var/run/ld-elf.so.hints" \ - "${ROOT:-/}etc/ld.so.conf" + ldconfig -X ${1} -r "${ROOT:-/}" ) ;; - *) - echo "Regenerating ${ROOT}/etc/ld.so.cache..." + FreeBSD | DragonFly) + echo "Regenerating ${ROOT}/var/run/ld-elf.so.hints..." ( cd / - ldconfig -X ${1} -r "${ROOT:-/}" + ldconfig -elf -i -f "${ROOT:-/}var/run/ld-elf.so.hints" \ + "${ROOT:-/}etc/ld.so.conf" ) ;; esac |