dev-util/scons: remove unused patch
authorMichael Mair-Keimberger <m.mairkeimberger@gmail.com>
Sat, 9 Nov 2019 18:40:41 +0000 (19:40 +0100)
committerMichał Górny <mgorny@gentoo.org>
Sat, 9 Nov 2019 18:47:19 +0000 (19:47 +0100)
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger@gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/13595
Signed-off-by: Michał Górny <mgorny@gentoo.org>
dev-util/scons/files/scons-2.5.1-respect-path.patch [deleted file]

diff --git a/dev-util/scons/files/scons-2.5.1-respect-path.patch b/dev-util/scons/files/scons-2.5.1-respect-path.patch
deleted file mode 100644 (file)
index d5da07b..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-Clang/LLVM is installed in an "odd" location (/usr/lib/llvm/<ver>/bin/)
-which is added to PATH.  Since we cannot know <ver> upfront, it's wrong
-to hardcode the PATH at the time of installation else we'd break after a
-Clang update.  Since Clang is the primary compiler on Darwin, just
-extract the relevant path on each invocation.
-
---- a/engine/SCons/Platform/posix.py
-+++ b/engine/SCons/Platform/posix.py
-@@ -87,9 +87,15 @@
-     pspawn = piped_env_spawn
-     # Note that this means that 'escape' is no longer used
-+    with open('@GENTOO_PORTAGE_EPREFIX@/etc/profile.env', 'r') as f:
-+        for l in f:
-+            if "export PATH=" in l:
-+                path = l.split('=')[1].strip("'")
-+                break
-+
-     if 'ENV' not in env:
-         env['ENV']        = {}
--    env['ENV']['PATH']    = '/usr/local/bin:/opt/bin:/bin:/usr/bin'
-+    env['ENV']['PATH']    = path
-     env['OBJPREFIX']      = ''
-     env['OBJSUFFIX']      = '.o'
-     env['SHOBJPREFIX']    = '$OBJPREFIX'
-@@ -104,7 +110,7 @@
-     env['LIBSUFFIXES']    = [ '$LIBSUFFIX', '$SHLIBSUFFIX' ]
-     env['PSPAWN']         = pspawn
-     env['SPAWN']          = spawn
--    env['SHELL']          = 'sh'
-+    env['SHELL']          = '@GENTOO_PORTAGE_EPREFIX@/bin/sh'
-     env['ESCAPE']         = escape
-     env['TEMPFILE']       = TempFileMunge
-     env['TEMPFILEPREFIX'] = '@'