From: Mike Frysinger <vapier@gentoo.org>
Date: Thu, 15 Dec 2005 04:51:44 +0000 (-0000)
Subject: Bug 115519 by Diego Petteno: Fix ldconfig command ordering, add dragonfly support
X-Git-Tag: v2.1_pre1~18
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=aac4d8aed3acc6e164798122423422a4f03030be;p=portage.git

Bug 115519 by Diego Petteno: Fix ldconfig command ordering, add dragonfly support

svn path=/main/trunk/; revision=2372
---

diff --git a/pym/portage.py b/pym/portage.py
index d0734b458..52a048053 100644
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -669,10 +669,10 @@ def env_update(makelinks=1):
 				commands.getstatusoutput("cd / ; /sbin/ldconfig -r "+root)
 			else:
 				commands.getstatusoutput("cd / ; /sbin/ldconfig -X -r "+root)
-	elif ostype == "FreeBSD":
+	elif ostype == "FreeBSD" or ostype == "DragonFly":
 		if (ld_cache_update):
 			writemsg(">>> Regenerating "+str(root)+"var/run/ld-elf.so.hints...\n")
-			commands.getstatusoutput("cd / ; /sbin/ldconfig -i -elf -f "+str(root)+"var/run/ld-elf.so.hints "+str(root)+"etc/ld.so.conf")
+			commands.getstatusoutput("cd / ; /sbin/ldconfig -elf -i -f "+str(root)+"var/run/ld-elf.so.hints "+str(root)+"etc/ld.so.conf")
 
 	del specials["LDPATH"]