[gentoo-portage-dev] [PATCH] _approx_multilib_categories: rename ia to ia64 (bug 550898)

[gentoo-portage-dev] [PATCH] _approx_multilib_categories: rename ia to ia64 (bug 550898)

[Zac Medico]

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
---
 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",
-- 
2.3.5

Re: [gentoo-portage-dev] [PATCH] _approx_multilib_categories: rename ia to ia64 (bug 550898)

[Mike Frysinger]

[-- Attachment #1: Type: text/plain, Size: 477 bytes --]

On 31 May 2015 11:43, Zac Medico wrote:
> 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.

looks obvious enough ;)
-mike

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]