From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 8768D1382C5 for ; Thu, 3 May 2018 18:48:17 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9F7A3E0A5C; Thu, 3 May 2018 18:48:16 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 7A6F5E0A5C for ; Thu, 3 May 2018 18:48:16 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2F6AB335C72 for ; Thu, 3 May 2018 18:48:15 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 175DA2A for ; Thu, 3 May 2018 18:48:13 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <1525373107.1b5110557d1dd725f7c12bbed4b7ceaaec29f2a3.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/portage/package/ebuild/ X-VCS-Repository: proj/portage X-VCS-Files: pym/portage/package/ebuild/config.py X-VCS-Directories: pym/portage/package/ebuild/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 1b5110557d1dd725f7c12bbed4b7ceaaec29f2a3 X-VCS-Branch: master Date: Thu, 3 May 2018 18:48:13 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 274a0b92-eb3d-498b-aab6-4e095ec47fb4 X-Archives-Hash: 1d2916a898a4f499bf7c6dbb010365d3 commit: 1b5110557d1dd725f7c12bbed4b7ceaaec29f2a3 Author: Zac Medico gentoo org> AuthorDate: Thu May 3 00:55:48 2018 +0000 Commit: Zac Medico gentoo 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 gentoo.org> Reviewed-by: Michał Górny gentoo.org> Reviewed-by: Brian Dolbec 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"]