On Wed, 2 May 2018 18:03:38 -0700 Zac Medico <zmed...@gentoo.org> wrote:
> 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. > > Bug: https://bugs.gentoo.org/654600 > Fixes: a41dacf7926c ("Export SYSROOT and ESYSROOT in ebuild env in > EAPI 7") --- > pym/portage/package/ebuild/config.py | 9 +++++++-- > 1 file changed, 7 insertions(+), 2 deletions(-) > > diff --git a/pym/portage/package/ebuild/config.py > b/pym/portage/package/ebuild/config.py index f9b257b86..96b2ebb71 > 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.path.sep) + > try: > builddir = mydict["PORTAGE_BUILDDIR"] > distdir = mydict["DISTDIR"] looks good -- Brian Dolbec <dolsen>
