commit: 1b5110557d1dd725f7c12bbed4b7ceaaec29f2a3 Author: Zac Medico <zmedico <AT> gentoo <DOT> org> AuthorDate: Thu May 3 00:55:48 2018 +0000 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> CommitDate: Thu May 3 18:45:07 2018 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=1b511055
config.environ: always strip slash from SYSROOT (bug 654600) 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") Reviewed-by: James Le Cuirot <chewi <AT> gentoo.org> Reviewed-by: Michał Górny <mgorny <AT> gentoo.org> Reviewed-by: Brian Dolbec <dolsen <AT> gentoo.org> 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..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"]
