[gentoo-commits] proj/elfix:elfix-0.7.x commit in: misc/

["Anthony G. Basile" <blueness@gentoo.org>]

commit:     e0c6e2bb8ef37f1c57cb5e83e11bd0c1458854f7
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 24 21:44:35 2012 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sat Dec 29 01:07:33 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/elfix.git;a=commit;h=e0c6e2bb

misc/link_maps_portage: fix get_{object_needed,libraries} for multilib

---
 misc/link_maps_portage |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/misc/link_maps_portage b/misc/link_maps_portage
index f55db6a..28bc0ea 100755
--- a/misc/link_maps_portage
+++ b/misc/link_maps_portage
@@ -41,9 +41,10 @@ def get_object_needed():
 		lines = re.split('\n', needs)
 		for line in lines:
 			link = re.split(';', line)
+			abi = link[0]
 			elf = link[1]
 			sonames = re.split(',', link[4])
-			object_needed[elf] = sonames
+			object_needed.setdefault(abi,{}).update({elf:sonames})
 
 	return object_needed
 
@@ -71,11 +72,12 @@ def get_libraries():
 		lines = re.split('\n', needs)
 		for line in lines:
 			link = re.split(';', line)
+			abi = link[0]
 			elf = link[1]
 			soname = link[2]
 			if soname:				#no soname => executable
-				library2soname[elf] = soname
-				soname2library[soname] = elf
+				library2soname[elf] = (soname,abi)
+				soname2library[(soname,abi)] = elf
 
 	return ( library2soname, soname2library )