Gentoo Archives: gentoo-portage-dev

From: Zac Medico <zmedico@g.o>
To: gentoo-portage-dev@l.g.o
Cc: Zac Medico <zmedico@g.o>
Subject: [gentoo-portage-dev] [PATCH] _approx_multilib_categories: rename ia to ia64 (bug 550898)
Date: Sun, 31 May 2015 18:44:06
Message-Id: 1433097829-379-1-git-send-email-zmedico@gentoo.org
1 In LinkageMapELF.py, there's a fallback mapping for
2 multilib categories, which is used by the LinkMapElf class when
3 NEEDED.ELF.2 does not contain multilib categories due to being
4 generated by older portage. This mapping should be consistent with
5 the mutilib categories generated by the compute_multilib_category
6 function which was modified by commit
7 b50bbcb70506254d66937dac376056bbf99b3fe9.
8
9 Fixes: b50bbcb70506 ("multilib: use ia64 as ia64 multilib name")
10 X-Gentoo-Bug: 550898
11 X-Gentoo-Bug-url: https://bugs.gentoo.org/show_bug.cgi?id=550898
12 ---
13 pym/portage/util/_dyn_libs/LinkageMapELF.py | 2 +-
14 1 file changed, 1 insertion(+), 1 deletion(-)
15
16 diff --git a/pym/portage/util/_dyn_libs/LinkageMapELF.py b/pym/portage/util/_dyn_libs/LinkageMapELF.py
17 index f4d8b5d..63e2213 100644
18 --- a/pym/portage/util/_dyn_libs/LinkageMapELF.py
19 +++ b/pym/portage/util/_dyn_libs/LinkageMapELF.py
20 @@ -30,7 +30,7 @@ _approx_multilib_categories = {
21 "AARCH64": "arm_64",
22 "ALPHA": "alpha_64",
23 "ARM": "arm_32",
24 - "IA_64": "ia_64",
25 + "IA_64": "ia64_64",
26 "MIPS": "mips_o32",
27 "PARISC": "hppa_64",
28 "PPC": "ppc_32",
29 --
30 2.3.5

Replies