commit: d43592155db5c85047c85b92a46638bf0684ae3e Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Thu Jan 21 10:06:58 2021 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Thu Jan 21 10:20:36 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4359215
dev-util/scons: Fix missing os import in Gentoo patch Closes: https://bugs.gentoo.org/766330 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> dev-util/scons/files/scons-4.1.0-env-passthrough.patch | 15 ++++++++------- .../scons/{scons-4.1.0.ebuild => scons-4.1.0-r1.ebuild} | 0 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/dev-util/scons/files/scons-4.1.0-env-passthrough.patch b/dev-util/scons/files/scons-4.1.0-env-passthrough.patch index 75172042e56..06ec2f21761 100644 --- a/dev-util/scons/files/scons-4.1.0-env-passthrough.patch +++ b/dev-util/scons/files/scons-4.1.0-env-passthrough.patch @@ -1,20 +1,20 @@ -From dd6021a9853f009e2f45f36b9aa80c5a78bc90ac Mon Sep 17 00:00:00 2001 +From fb07dc4b4fa178b0c424c5f400b18669abd8960e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgo...@gentoo.org> Date: Wed, 9 May 2018 17:04:49 +0200 -Subject: [PATCH 1/2] posix: Support GENTOO_SCONS_ENV_PASSTHROUGH=1 +Subject: [PATCH] posix: Support GENTOO_SCONS_ENV_PASSTHROUGH=1 Support GENTOO_SCONS_ENV_PASSTHROUGH=1 variable to override the default of wiping the environment and resetting PATH to default, and instead pass all variables through. --- - SCons/Platform/posix.py | 14 +++++++++++--- - 1 file changed, 11 insertions(+), 3 deletions(-) + SCons/Platform/posix.py | 15 ++++++++++++--- + 1 file changed, 12 insertions(+), 3 deletions(-) -diff --git a/src/SCons/Platform/posix.py b/src/SCons/Platform/posix.py -index 4c9f8f9ba..37786229f 100644 +diff --git a/SCons/Platform/posix.py b/SCons/Platform/posix.py +index 4c9f8f9ba..fbc81196d 100644 --- a/src/SCons/Platform/posix.py +++ b/src/SCons/Platform/posix.py -@@ -82,9 +82,17 @@ def generate(env): +@@ -82,9 +82,18 @@ def generate(env): pspawn = piped_env_spawn # Note that this means that 'escape' is no longer used @@ -22,6 +22,7 @@ index 4c9f8f9ba..37786229f 100644 - env['ENV'] = {} - env['ENV']['PATH'] = '/usr/local/bin:/opt/bin:/bin:/usr/bin:/snap/bin' + # Force pass-through of environment variables in Gentoo builds ++ import os + if os.environ.get('GENTOO_SCONS_ENV_PASSTHROUGH', False): + new_env = os.environ.copy() + if 'ENV' in env: diff --git a/dev-util/scons/scons-4.1.0.ebuild b/dev-util/scons/scons-4.1.0-r1.ebuild similarity index 100% rename from dev-util/scons/scons-4.1.0.ebuild rename to dev-util/scons/scons-4.1.0-r1.ebuild
