diff options
| -rw-r--r-- | pym/_emerge/__init__.py | 1 | ||||
| -rw-r--r-- | pym/portage/__init__.py | 12 |
2 files changed, 13 insertions, 0 deletions
diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py index 6b0f54e49..50d6b7cd2 100644 --- a/pym/_emerge/__init__.py +++ b/pym/_emerge/__init__.py @@ -3170,6 +3170,7 @@ class EbuildPhase(CompositeTask): settings = self.settings if self.phase == "install": + portage._post_src_install_chost_fix(settings) portage._post_src_install_uid_fix(settings) post_phase_cmds = self._post_phase_cmds.get(self.phase) diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py index a657a19be..cc87dcf4d 100644 --- a/pym/portage/__init__.py +++ b/pym/portage/__init__.py @@ -4714,6 +4714,7 @@ def spawnebuild(mydo, actionmap, mysettings, debug, alwaysdep=0, if mydo == "install": _check_build_log(mysettings) if phase_retval == os.EX_OK: + _post_src_install_chost_fix(mysettings) phase_retval = _post_src_install_checks(mysettings) if mydo == "test" and phase_retval != os.EX_OK and \ @@ -4864,6 +4865,17 @@ def _check_build_log(mysettings, out=None): msg.extend("\t" + line for line in make_jobserver) _eqawarn(msg) +def _post_src_install_chost_fix(settings): + """ + It's possible that the ebuild has changed the + CHOST variable, so revert it to the initial + setting. + """ + chost = settings.get('CHOST') + if chost: + write_atomic(os.path.join(settings['PORTAGE_BUILDDIR'], + 'build-info', 'CHOST'), chost + '\n') + def _post_src_install_uid_fix(mysettings): """ Files in $D with user and group bits that match the "portage" |