| 1 |
commit: 259272b9ffcf2c3d813487bf0119f761f32476e6 |
| 2 |
Author: Thomas Sachau <tommy <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Oct 4 13:23:22 2015 +0000 |
| 4 |
Commit: Thomas Sachau <tommy <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Oct 4 13:23:22 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=259272b9 |
| 7 |
|
| 8 |
Convert forced flags from new multilib eclass to the matching ones from multilib-portage |
| 9 |
|
| 10 |
pym/portage/dep/dep_check.py | 5 ++++- |
| 11 |
1 file changed, 4 insertions(+), 1 deletion(-) |
| 12 |
|
| 13 |
diff --git a/pym/portage/dep/dep_check.py b/pym/portage/dep/dep_check.py |
| 14 |
index dab6961..4e97ffa 100644 |
| 15 |
--- a/pym/portage/dep/dep_check.py |
| 16 |
+++ b/pym/portage/dep/dep_check.py |
| 17 |
@@ -84,11 +84,14 @@ def _expand_new_virtuals(mysplit, edebug, mydbapi, mysettings, myroot="/", |
| 18 |
use_tokens = [] |
| 19 |
else: |
| 20 |
use_tokens = list(x.unevaluated_atom.use.tokens) |
| 21 |
+ if 'abi_x86_64' in use_tokens: |
| 22 |
+ use_tokens[use_tokens.index('abi_x86_64')] = 'multilib_abi_amd64' |
| 23 |
+ if 'abi_x86_32' in use_tokens: |
| 24 |
+ use_tokens[use_tokens.index('abi_x86_32')] = 'multilib_abi_x86' |
| 25 |
use_tokens.extend(multilib_flags) |
| 26 |
x = Atom(x.unevaluated_atom.without_use + |
| 27 |
"[%s]" % (",".join(use_tokens))) |
| 28 |
x = x.evaluate_conditionals(myuse) |
| 29 |
- |
| 30 |
mykey = x.cp |
| 31 |
if not mykey.startswith("virtual/"): |
| 32 |
newsplit.append(x) |
Archives