| 1 |
commit: c3ef903d1c95ce28922a2d7dcb00cc7a1d690201 |
| 2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun May 31 18:42:49 2015 +0000 |
| 4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Jun 2 03:47:14 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=c3ef903d |
| 7 |
|
| 8 |
_approx_multilib_categories: rename ia to ia64 (bug 550898) |
| 9 |
|
| 10 |
In LinkageMapELF.py, there's a fallback mapping for |
| 11 |
multilib categories, which is used by the LinkMapElf class when |
| 12 |
NEEDED.ELF.2 does not contain multilib categories due to being |
| 13 |
generated by older portage. This mapping should be consistent with |
| 14 |
the mutilib categories generated by the compute_multilib_category |
| 15 |
function which was modified by commit |
| 16 |
b50bbcb70506254d66937dac376056bbf99b3fe9. |
| 17 |
|
| 18 |
Fixes: b50bbcb70506 ("multilib: use ia64 as ia64 multilib name") |
| 19 |
X-Gentoo-Bug: 550898 |
| 20 |
X-Gentoo-Bug-url: https://bugs.gentoo.org/show_bug.cgi?id=550898 |
| 21 |
Acked-by: Mike Frysinger <vapier <AT> gentoo.org> |
| 22 |
|
| 23 |
pym/portage/util/_dyn_libs/LinkageMapELF.py | 2 +- |
| 24 |
1 file changed, 1 insertion(+), 1 deletion(-) |
| 25 |
|
| 26 |
diff --git a/pym/portage/util/_dyn_libs/LinkageMapELF.py b/pym/portage/util/_dyn_libs/LinkageMapELF.py |
| 27 |
index f4d8b5d..63e2213 100644 |
| 28 |
--- a/pym/portage/util/_dyn_libs/LinkageMapELF.py |
| 29 |
+++ b/pym/portage/util/_dyn_libs/LinkageMapELF.py |
| 30 |
@@ -30,7 +30,7 @@ _approx_multilib_categories = { |
| 31 |
"AARCH64": "arm_64", |
| 32 |
"ALPHA": "alpha_64", |
| 33 |
"ARM": "arm_32", |
| 34 |
- "IA_64": "ia_64", |
| 35 |
+ "IA_64": "ia64_64", |
| 36 |
"MIPS": "mips_o32", |
| 37 |
"PARISC": "hppa_64", |
| 38 |
"PPC": "ppc_32", |
Archives