| 1 |
commit: 5077a3273c1f6224b1e954b1cd0063d97f383c86 |
| 2 |
Author: Thomas Sachau <tommy <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Feb 26 13:02:10 2012 +0000 |
| 4 |
Commit: Thomas Sachau <tommy <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Feb 26 13:02:10 2012 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=5077a327 |
| 7 |
|
| 8 |
Package.py: Move multilib behind force-multilib FEATURE |
| 9 |
|
| 10 |
--- |
| 11 |
pym/_emerge/Package.py | 5 +++-- |
| 12 |
1 files changed, 3 insertions(+), 2 deletions(-) |
| 13 |
|
| 14 |
diff --git a/pym/_emerge/Package.py b/pym/_emerge/Package.py |
| 15 |
index ee2855d..0243c04 100644 |
| 16 |
--- a/pym/_emerge/Package.py |
| 17 |
+++ b/pym/_emerge/Package.py |
| 18 |
@@ -638,8 +638,9 @@ class _PackageMetadataWrapper(_PackageMetadataWrapperBase): |
| 19 |
self._pkg.inherited = v |
| 20 |
|
| 21 |
def _set_iuse(self, k, v): |
| 22 |
- for multilib_abis in self._pkg.root_config.settings.get("MULTILIB_ABIS", '').split(' '): |
| 23 |
- v = v + " multilib_abi_" + multilib_abis |
| 24 |
+ if 'force-multilib' in self._pkg.root_config.settings.get("FEATURES", ''): |
| 25 |
+ for multilib_abis in self._pkg.root_config.settings.get("MULTILIB_ABIS", '').split(' '): |
| 26 |
+ v = v + " multilib_abi_" + multilib_abis |
| 27 |
self._pkg.iuse = self._pkg._iuse( |
| 28 |
v.split(), self._pkg.root_config.settings._iuse_implicit_match) |
Archives