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 85E91138CD0 for ; Sun, 31 May 2015 18:44:06 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7D316E0895; Sun, 31 May 2015 18:44:00 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 16EFEE0883 for ; Sun, 31 May 2015 18:43:59 +0000 (UTC) Received: from localhost.localdomain (ip174-67-205-96.oc.oc.cox.net [174.67.205.96]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: zmedico) by smtp.gentoo.org (Postfix) with ESMTPSA id E7D04340940; Sun, 31 May 2015 18:43:58 +0000 (UTC) From: Zac Medico To: gentoo-portage-dev@lists.gentoo.org Cc: Zac Medico Subject: [gentoo-portage-dev] [PATCH] _approx_multilib_categories: rename ia to ia64 (bug 550898) Date: Sun, 31 May 2015 11:43:49 -0700 Message-Id: <1433097829-379-1-git-send-email-zmedico@gentoo.org> X-Mailer: git-send-email 2.3.5 Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-portage-dev@lists.gentoo.org Reply-to: gentoo-portage-dev@lists.gentoo.org X-Archives-Salt: d102519c-b233-42ba-a01a-97c2c138f755 X-Archives-Hash: 6ce361fa02f3869d1675356aa6ab5a85 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