|
|
@ -2,6 +2,7 @@ |
|
|
|
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
|
|
|
|
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
|
|
|
|
#
|
|
|
|
#
|
|
|
|
# Filename: package/.../scons/environment.patch
|
|
|
|
# Filename: package/.../scons/environment.patch
|
|
|
|
|
|
|
|
# Copyright (C) 2009 The OpenSDE Project
|
|
|
|
# Copyright (C) 2004 - 2006 The T2 SDE Project
|
|
|
|
# Copyright (C) 2004 - 2006 The T2 SDE Project
|
|
|
|
#
|
|
|
|
#
|
|
|
|
# More information can be found in the files COPYING and README.
|
|
|
|
# More information can be found in the files COPYING and README.
|
|
|
@ -14,19 +15,14 @@ |
|
|
|
# version.
|
|
|
|
# version.
|
|
|
|
# --- SDE-COPYRIGHT-NOTE-END ---
|
|
|
|
# --- SDE-COPYRIGHT-NOTE-END ---
|
|
|
|
|
|
|
|
|
|
|
|
We must inherit the build environment to have the PATH to the wrappers as well
|
|
|
|
--- scons-1.2.0/engine/SCons/Action.py.orig 2008-12-21 08:59:59.000000000 +0200
|
|
|
|
as their configuration.
|
|
|
|
+++ scons-1.2.0/engine/SCons/Action.py 2009-02-28 00:06:33.000000000 +0200
|
|
|
|
|
|
|
|
@@ -561,7 +561,7 @@
|
|
|
|
- Rene Rebe <rene@exactcode.de>
|
|
|
|
def get_default_ENV(env):
|
|
|
|
|
|
|
|
global default_ENV
|
|
|
|
--- ./engine/SCons/Action.py.orig 2005-09-08 09:15:13.000000000 -0400
|
|
|
|
try:
|
|
|
|
+++ ./engine/SCons/Action.py 2005-11-12 02:19:01.160181888 -0300
|
|
|
|
- return env['ENV']
|
|
|
|
@@ -437,7 +437,7 @@
|
|
|
|
+ return os.environ
|
|
|
|
escape = env.get('ESCAPE', lambda x: x)
|
|
|
|
except KeyError:
|
|
|
|
|
|
|
|
if not default_ENV:
|
|
|
|
try:
|
|
|
|
import SCons.Environment
|
|
|
|
- ENV = env['ENV']
|
|
|
|
|
|
|
|
+ ENV = os.environ
|
|
|
|
|
|
|
|
except KeyError:
|
|
|
|
|
|
|
|
global default_ENV
|
|
|
|
|
|
|
|
if not default_ENV:
|
|
|
|
|
|
|
|