From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 5A1371381F3 for ; Mon, 24 Dec 2012 22:04:10 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 58A2321C010 for ; Mon, 24 Dec 2012 22:04:09 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 149F921C033 for ; Mon, 24 Dec 2012 21:44:47 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2881233D90A for ; Mon, 24 Dec 2012 21:44:46 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id BA2D3E543C for ; Mon, 24 Dec 2012 21:44:44 +0000 (UTC) From: "Anthony G. Basile" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Anthony G. Basile" Message-ID: <1356385475.e853f3f933ead5540562701533a389c31337877f.blueness@gentoo> Subject: [gentoo-commits] proj/elfix:master commit in: misc/ X-VCS-Repository: proj/elfix X-VCS-Files: misc/link_maps_portage X-VCS-Directories: misc/ X-VCS-Committer: blueness X-VCS-Committer-Name: Anthony G. Basile X-VCS-Revision: e853f3f933ead5540562701533a389c31337877f X-VCS-Branch: master Date: Mon, 24 Dec 2012 21:44:44 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 8ebe06ac-84aa-4336-b149-a96bea9ebacd X-Archives-Hash: b1de51440647e8a24866100f3872855c commit: e853f3f933ead5540562701533a389c31337877f Author: Anthony G. Basile gentoo org> AuthorDate: Mon Dec 24 21:44:35 2012 +0000 Commit: Anthony G. Basile gentoo org> CommitDate: Mon Dec 24 21:44:35 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/elfix.git;a=commit;h=e853f3f9 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 )