| 1 |
commit: da2c54602be36fd73dedfdc7c0ca03da55d56aa9 |
| 2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Jul 8 18:34:19 2012 +0000 |
| 4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Jul 8 18:34:19 2012 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=da2c5460 |
| 7 |
|
| 8 |
config: cleanup redundant force-multilib code |
| 9 |
|
| 10 |
--- |
| 11 |
pym/portage/package/ebuild/config.py | 24 ++++++++++-------------- |
| 12 |
1 files changed, 10 insertions(+), 14 deletions(-) |
| 13 |
|
| 14 |
diff --git a/pym/portage/package/ebuild/config.py b/pym/portage/package/ebuild/config.py |
| 15 |
index b349ca3..35e6a99 100644 |
| 16 |
--- a/pym/portage/package/ebuild/config.py |
| 17 |
+++ b/pym/portage/package/ebuild/config.py |
| 18 |
@@ -426,7 +426,6 @@ class config(object): |
| 19 |
known_repos = [] |
| 20 |
portdir = "" |
| 21 |
portdir_overlay = "" |
| 22 |
- features = [] |
| 23 |
for confs in [make_globals, make_conf, self.configdict["env"]]: |
| 24 |
v = confs.get("PORTDIR") |
| 25 |
if v is not None: |
| 26 |
@@ -436,9 +435,6 @@ class config(object): |
| 27 |
if v is not None: |
| 28 |
portdir_overlay = v |
| 29 |
known_repos.extend(shlex_split(v)) |
| 30 |
- v = confs.get("FEATURES") |
| 31 |
- if v is not None: |
| 32 |
- features.append(v.split()) |
| 33 |
known_repos = frozenset(known_repos) |
| 34 |
self["PORTDIR"] = portdir |
| 35 |
self["PORTDIR_OVERLAY"] = portdir_overlay |
| 36 |
@@ -478,11 +474,6 @@ class config(object): |
| 37 |
self.configlist.append(mygcfg) |
| 38 |
self.configdict["defaults"]=self.configlist[-1] |
| 39 |
|
| 40 |
- features = stack_lists(features) |
| 41 |
- if 'force-multilib' in features: |
| 42 |
- if self.configdict["defaults"].get('DEFAULT_ABI', None) is not None: |
| 43 |
- self.configdict["defaults"]["USE"] = self.configdict["defaults"].get("USE", "") + " multilib_abi_" + self.configdict["defaults"].get("DEFAULT_ABI", "") |
| 44 |
- |
| 45 |
mygcfg = getconfig( |
| 46 |
os.path.join(config_root, MAKE_CONF_FILE), |
| 47 |
tolerant=tolerant, allow_sourcing=True, |
| 48 |
@@ -796,10 +787,20 @@ class config(object): |
| 49 |
self[var] = default_val |
| 50 |
self.backup_changes(var) |
| 51 |
|
| 52 |
+ features = [] |
| 53 |
+ for x in ("globals", "defaults", "conf", "env"): |
| 54 |
+ v = self.configdict[x].get("FEATURES") |
| 55 |
+ if v is not None: |
| 56 |
+ features.append(v.split()) |
| 57 |
+ features = stack_lists(features) |
| 58 |
+ |
| 59 |
if 'force-multilib' in features: |
| 60 |
#add multilib_abi internally to list of USE_EXPANDed vars |
| 61 |
self["USE_EXPAND"] = "MULTILIB_ABI" + " " + self.get("USE_EXPAND", "") |
| 62 |
self.backup_changes("USE_EXPAND") |
| 63 |
+ default_abi = self.configdict["defaults"].get('DEFAULT_ABI', '').strip() |
| 64 |
+ if default_abi: |
| 65 |
+ self.configdict["defaults"]["USE"] = self.configdict["defaults"].get("USE", "") + " multilib_abi_" + default_abi |
| 66 |
|
| 67 |
# initialize self.features |
| 68 |
self.regenerate() |
| 69 |
@@ -1354,9 +1355,6 @@ class config(object): |
| 70 |
if pkg_defaults: |
| 71 |
defaults.extend(pkg_defaults) |
| 72 |
defaults = " ".join(defaults) |
| 73 |
- if 'force-multilib' in self.features: |
| 74 |
- if self.configdict["defaults"].get('DEFAULT_ABI', None) is not None: |
| 75 |
- defaults = defaults + " multilib_abi_" + self.configdict["defaults"].get("DEFAULT_ABI", "") |
| 76 |
if defaults != self.configdict["defaults"].get("USE",""): |
| 77 |
self.configdict["defaults"]["USE"] = defaults |
| 78 |
has_changed = True |
| 79 |
@@ -2008,8 +2006,6 @@ class config(object): |
| 80 |
|
| 81 |
# Do the USE calculation last because it depends on USE_EXPAND. |
| 82 |
use_expand = self.get("USE_EXPAND", "").split() |
| 83 |
- if 'force-multilib' in self.get("FEATURES", ""): |
| 84 |
- use_expand.append("MULTILIB_ABI") |
| 85 |
use_expand_dict = self._use_expand_dict |
| 86 |
use_expand_dict.clear() |
| 87 |
for k in use_expand: |
Archives