| 1 |
commit: a9796ea77d63131c6b1ce03ce16d2cb574a10cfc |
| 2 |
Author: Thomas Sachau <tommy <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Feb 26 12:26:40 2012 +0000 |
| 4 |
Commit: Thomas Sachau <tommy <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Feb 26 12:26:40 2012 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=a9796ea7 |
| 7 |
|
| 8 |
config.py: Move multilib behind force-multilib FEATURE |
| 9 |
|
| 10 |
--- |
| 11 |
pym/portage/package/ebuild/config.py | 26 ++++++++++++++++---------- |
| 12 |
1 files changed, 16 insertions(+), 10 deletions(-) |
| 13 |
|
| 14 |
diff --git a/pym/portage/package/ebuild/config.py b/pym/portage/package/ebuild/config.py |
| 15 |
index c9d1d1d..799a019 100644 |
| 16 |
--- a/pym/portage/package/ebuild/config.py |
| 17 |
+++ b/pym/portage/package/ebuild/config.py |
| 18 |
@@ -441,8 +441,10 @@ class config(object): |
| 19 |
mygcfg = {} |
| 20 |
self.configlist.append(mygcfg) |
| 21 |
self.configdict["defaults"]=self.configlist[-1] |
| 22 |
- if self.configdict["defaults"].get('DEFAULT_ABI', None) is not None: |
| 23 |
- self.configdict["defaults"]["USE"] = self.configdict["defaults"].get("USE", "") + " multilib_abi_" + self.configdict["defaults"].get("DEFAULT_ABI", "") |
| 24 |
+ |
| 25 |
+ if 'force-multilib' in confs.get("FEATURES", ""): |
| 26 |
+ if self.configdict["defaults"].get('DEFAULT_ABI', None) is not None: |
| 27 |
+ self.configdict["defaults"]["USE"] = self.configdict["defaults"].get("USE", "") + " multilib_abi_" + self.configdict["defaults"].get("DEFAULT_ABI", "") |
| 28 |
|
| 29 |
mygcfg = getconfig( |
| 30 |
os.path.join(config_root, MAKE_CONF_FILE), |
| 31 |
@@ -772,9 +774,10 @@ class config(object): |
| 32 |
self[var] = default_val |
| 33 |
self.backup_changes(var) |
| 34 |
|
| 35 |
- #add multilib_abi internally to list of USE_EXPANDed vars |
| 36 |
- self["USE_EXPAND"] = "multilib_abi" + " " + self.get("USE_EXPAND", "") |
| 37 |
- self.backup_changes("USE_EXPAND") |
| 38 |
+ if 'force-multilib' in self.get("FEATURES", ""): |
| 39 |
+ #add multilib_abi internally to list of USE_EXPANDed vars |
| 40 |
+ self["USE_EXPAND"] = "multilib_abi" + " " + self.get("USE_EXPAND", "") |
| 41 |
+ self.backup_changes("USE_EXPAND") |
| 42 |
|
| 43 |
# initialize self.features |
| 44 |
self.regenerate() |
| 45 |
@@ -1286,8 +1289,9 @@ class config(object): |
| 46 |
if pkg_defaults: |
| 47 |
defaults.extend(pkg_defaults) |
| 48 |
defaults = " ".join(defaults) |
| 49 |
- if self.configdict["defaults"].get('DEFAULT_ABI', None) is not None: |
| 50 |
- defaults = defaults + " multilib_abi_" + self.configdict["defaults"].get("DEFAULT_ABI", "") |
| 51 |
+ if 'force-multilib' in self.get("FEATURES", ""): |
| 52 |
+ if self.configdict["defaults"].get('DEFAULT_ABI', None) is not None: |
| 53 |
+ defaults = defaults + " multilib_abi_" + self.configdict["defaults"].get("DEFAULT_ABI", "") |
| 54 |
if defaults != self.configdict["defaults"].get("USE",""): |
| 55 |
self.configdict["defaults"]["USE"] = defaults |
| 56 |
has_changed = True |
| 57 |
@@ -1525,8 +1529,9 @@ class config(object): |
| 58 |
# FEATURES=test for all ebuilds, regardless of explicit IUSE. |
| 59 |
iuse_implicit.add("test") |
| 60 |
|
| 61 |
- for multilib_abis in self.get('MULTILIB_ABIS', '').split(' '): |
| 62 |
- iuse_implicit.add("multilib_abi_" + multilib_abis) |
| 63 |
+ if 'force-multilib' in self.get("FEATURES", ""): |
| 64 |
+ for multilib_abis in self.get('MULTILIB_ABIS', '').split(' '): |
| 65 |
+ iuse_implicit.add("multilib_abi_" + multilib_abis) |
| 66 |
|
| 67 |
return iuse_implicit |
| 68 |
|
| 69 |
@@ -1935,7 +1940,8 @@ class config(object): |
| 70 |
|
| 71 |
# Do the USE calculation last because it depends on USE_EXPAND. |
| 72 |
use_expand = self.get("USE_EXPAND", "").split() |
| 73 |
- use_expand.append("MULTILIB_ABI") |
| 74 |
+ if 'force-multilib' in self.get("FEATURES", ""): |
| 75 |
+ use_expand.append("MULTILIB_ABI") |
| 76 |
use_expand_dict = self._use_expand_dict |
| 77 |
use_expand_dict.clear() |
| 78 |
for k in use_expand: |
Archives