Minix/pkgsrc-ng
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Import of pkgsrc-2016Q3

Browse Source
This commit is contained in:
Lionel Sambuc
2016-10-14 07:49:11 +02:00
committed by Lionel Sambuc
parent 9d819b6d54
commit 1242aa1e36
35952 changed files with 949749 additions and 377083 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
chat/swift/patches/patch-BuildTools_SCons_SConscript.boot
View File

@@ -1,16 +1,19 @@
$NetBSD: patch-BuildTools_SCons_SConscript.boot,v 1.1 2014/12/12 10:50:49 joerg Exp $
$NetBSD: patch-BuildTools_SCons_SConscript.boot,v 1.2 2016/03/01 13:25:01 wiz Exp $
--- BuildTools/SCons/SConscript.boot.orig 2014-12-11 23:47:38.000000000 +0000
Don't strip environment so pkgsrc settings survive.
--- BuildTools/SCons/SConscript.boot.orig 2015-07-22 14:04:23.000000000 +0000
+++ BuildTools/SCons/SConscript.boot
@@ -65,10 +65,7 @@ vars.Add(BoolVariable("set_iterator_debu
@@ -106,11 +106,7 @@ vars.Add(BoolVariable("install_git_hooks
# Set up default build & configure environment
################################################################################
-env_ENV = {
- 'PATH' : os.environ['PATH'],
- 'LD_LIBRARY_PATH' : os.environ.get("LD_LIBRARY_PATH", ""),
- 'PATH' : os.environ['PATH'],
- 'LD_LIBRARY_PATH' : os.environ.get("LD_LIBRARY_PATH", ""),
- 'TERM' : os.environ.get("TERM", ""),
-}
+env_ENV = os.environ
if "MSVC_VERSION" in ARGUMENTS :
env = Environment(ENV = env_ENV, variables = vars, MSVC_VERSION = ARGUMENTS["MSVC_VERSION"])
else :
env = Environment(ENV = env_ENV, variables = vars, MSVC_VERSION = ARGUMENTS["MSVC_VERSION"], platform = ARGUMENTS.get("PLATFORM", None))