[gentoo-commits] eselect r818 - in trunk: . modules

[gentoo-commits] eselect r818 - in trunk: . modules

[Ulrich Mueller (ulm)]

Author: ulm
Date: 2011-06-29 18:40:05 +0000 (Wed, 29 Jun 2011)
New Revision: 818

Modified:
   trunk/ChangeLog
   trunk/modules/env.eselect
Log:
env.eselect: Call ldconfig only for Linux/GNU and BSD systems.

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2011-06-29 18:19:12 UTC (rev 817)
+++ trunk/ChangeLog	2011-06-29 18:40:05 UTC (rev 818)
@@ -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

Modified: trunk/modules/env.eselect
===================================================================
--- trunk/modules/env.eselect	2011-06-29 18:19:12 UTC (rev 817)
+++ trunk/modules/env.eselect	2011-06-29 18:40:05 UTC (rev 818)
@@ -218,6 +218,13 @@
 # Update ld.so.cache using ldconfig
 update_ldcache() {
 	case $(uname -s) in
+	Linux | *GNU | *gnu)
+		echo "Regenerating ${ROOT}/etc/ld.so.cache..."
+		(
+			cd /
+			ldconfig -X ${1} -r "${ROOT:-/}"
+		)
+		;;
 	FreeBSD | DragonFly)
 		echo "Regenerating ${ROOT}/var/run/ld-elf.so.hints..."
 		(
@@ -226,13 +233,6 @@
 				"${ROOT:-/}etc/ld.so.conf"
 		)
 		;;
-	*)
-		echo "Regenerating ${ROOT}/etc/ld.so.cache..."
-		(
-			cd /
-			ldconfig -X ${1} -r "${ROOT:-/}"
-		)
-		;;
 	esac
 }