diff options
Diffstat (limited to 'pym/portage/package')
| -rw-r--r-- | pym/portage/package/ebuild/config.py | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/pym/portage/package/ebuild/config.py b/pym/portage/package/ebuild/config.py index f9b257b86..88acac5cc 100644 --- a/pym/portage/package/ebuild/config.py +++ b/pym/portage/package/ebuild/config.py @@ -2813,11 +2813,16 @@ class config(object): mydict.pop("ECLASSDIR", None) if not eapi_attrs.path_variables_end_with_trailing_slash: - for v in ("D", "ED", "ROOT", "EROOT", "SYSROOT", "ESYSROOT", - "BROOT"): + for v in ("D", "ED", "ROOT", "EROOT", "ESYSROOT", "BROOT"): if v in mydict: mydict[v] = mydict[v].rstrip(os.path.sep) + # Since SYSROOT=/ interacts badly with autotools.eclass (bug 654600), + # and no EAPI expects SYSROOT to have a trailing slash, always strip + # the trailing slash from SYSROOT. + if 'SYSROOT' in mydict: + mydict['SYSROOT'] = mydict['SYSROOT'].rstrip(os.sep) + try: builddir = mydict["PORTAGE_BUILDDIR"] distdir = mydict["DISTDIR"] |