[gentoo-commits] proj/portage:master commit in: pym/portage/util/_dyn_libs/

[Zac Medico]

commit:     c3ef903d1c95ce28922a2d7dcb00cc7a1d690201
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Sun May 31 18:42:49 2015 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Tue Jun  2 03:47:14 2015 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=c3ef903d

_approx_multilib_categories: rename ia to ia64 (bug 550898)

In LinkageMapELF.py, there's a fallback mapping for
multilib categories, which is used by the LinkMapElf class when
NEEDED.ELF.2 does not contain multilib categories due to being
generated by older portage. This mapping should be consistent with
the mutilib categories generated by the compute_multilib_category
function which was modified by commit
b50bbcb70506254d66937dac376056bbf99b3fe9.

Fixes: b50bbcb70506 ("multilib: use ia64 as ia64 multilib name")
X-Gentoo-Bug: 550898
X-Gentoo-Bug-url: https://bugs.gentoo.org/show_bug.cgi?id=550898
Acked-by: Mike Frysinger <vapier <AT> gentoo.org>

 pym/portage/util/_dyn_libs/LinkageMapELF.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pym/portage/util/_dyn_libs/LinkageMapELF.py 
b/pym/portage/util/_dyn_libs/LinkageMapELF.py
index f4d8b5d..63e2213 100644
--- a/pym/portage/util/_dyn_libs/LinkageMapELF.py
+++ b/pym/portage/util/_dyn_libs/LinkageMapELF.py
@@ -30,7 +30,7 @@ _approx_multilib_categories = {
        "AARCH64":       "arm_64",
        "ALPHA":         "alpha_64",
        "ARM":           "arm_32",
-       "IA_64":         "ia_64",
+       "IA_64":         "ia64_64",
        "MIPS":          "mips_o32",
        "PARISC":        "hppa_64",
        "PPC":           "ppc_32",