1 |
Author: ulm |
2 |
Date: 2011-06-29 18:40:05 +0000 (Wed, 29 Jun 2011) |
3 |
New Revision: 818 |
4 |
|
5 |
Modified: |
6 |
trunk/ChangeLog |
7 |
trunk/modules/env.eselect |
8 |
Log: |
9 |
env.eselect: Call ldconfig only for Linux/GNU and BSD systems. |
10 |
|
11 |
Modified: trunk/ChangeLog |
12 |
=================================================================== |
13 |
--- trunk/ChangeLog 2011-06-29 18:19:12 UTC (rev 817) |
14 |
+++ trunk/ChangeLog 2011-06-29 18:40:05 UTC (rev 818) |
15 |
@@ -1,3 +1,8 @@ |
16 |
+2011-06-29 Ulrich Mueller <ulm@g.o> |
17 |
+ |
18 |
+ * modules/env.eselect (update_ldcache): Call ldconfig only for |
19 |
+ Linux/GNU and BSD systems. |
20 |
+ |
21 |
2011-06-29 Michał Górny <mgorny@g.o> |
22 |
|
23 |
* modules/env.eselect (update_ldcache): Call ldconfig with '-X' to |
24 |
|
25 |
Modified: trunk/modules/env.eselect |
26 |
=================================================================== |
27 |
--- trunk/modules/env.eselect 2011-06-29 18:19:12 UTC (rev 817) |
28 |
+++ trunk/modules/env.eselect 2011-06-29 18:40:05 UTC (rev 818) |
29 |
@@ -218,6 +218,13 @@ |
30 |
# Update ld.so.cache using ldconfig |
31 |
update_ldcache() { |
32 |
case $(uname -s) in |
33 |
+ Linux | *GNU | *gnu) |
34 |
+ echo "Regenerating ${ROOT}/etc/ld.so.cache..." |
35 |
+ ( |
36 |
+ cd / |
37 |
+ ldconfig -X ${1} -r "${ROOT:-/}" |
38 |
+ ) |
39 |
+ ;; |
40 |
FreeBSD | DragonFly) |
41 |
echo "Regenerating ${ROOT}/var/run/ld-elf.so.hints..." |
42 |
( |
43 |
@@ -226,13 +233,6 @@ |
44 |
"${ROOT:-/}etc/ld.so.conf" |
45 |
) |
46 |
;; |
47 |
- *) |
48 |
- echo "Regenerating ${ROOT}/etc/ld.so.cache..." |
49 |
- ( |
50 |
- cd / |
51 |
- ldconfig -X ${1} -r "${ROOT:-/}" |
52 |
- ) |
53 |
- ;; |
54 |
esac |
55 |
} |