diff options
| author | Dmitry Marakasov <amdmi3@FreeBSD.org> | 2014-12-02 14:25:59 +0000 |
|---|---|---|
| committer | Dmitry Marakasov <amdmi3@FreeBSD.org> | 2014-12-02 14:25:59 +0000 |
| commit | 5376690ec9ffee765c1af1079f1b23a9205ffb1a (patch) | |
| tree | a6eb529f8c015f6fcfd74e0e23646190fcf8a252 /devel/jsoncpp | |
| parent | Update to 0.4.2: (diff) | |
- Prevent SCons from trimming environment
PR: 195577
Submitted by: amdmi3
Approved by: johan@stromnet.se (maintainer)
Notes
Notes:
svn path=/head/; revision=373763
Diffstat (limited to 'devel/jsoncpp')
| -rw-r--r-- | devel/jsoncpp/files/patch-SConstruct | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/devel/jsoncpp/files/patch-SConstruct b/devel/jsoncpp/files/patch-SConstruct index c44bf944260d..c888328d5857 100644 --- a/devel/jsoncpp/files/patch-SConstruct +++ b/devel/jsoncpp/files/patch-SConstruct @@ -1,5 +1,5 @@ ---- ./SConstruct.orig 2014-08-22 14:25:14.780951671 -0500 -+++ ./SConstruct 2014-08-22 14:25:37.478948513 -0500 +--- SConstruct.orig 2014-12-02 06:28:17.000000000 +0300 ++++ SConstruct 2014-12-02 06:28:31.000000000 +0300 @@ -26,7 +26,7 @@ if platform == 'linux-gcc': CXX = 'g++' # not quite right, but env is not yet available. @@ -9,6 +9,15 @@ platform = 'linux-gcc-%s' %version print "Using platform '%s'" %platform LD_LIBRARY_PATH = os.environ.get('LD_LIBRARY_PATH', '') +@@ -65,7 +65,7 @@ + return vars + + +-env = Environment( ENV = make_environ_vars(), ++env = Environment( ENV = os.environ, + toolpath = ['scons-tools'], + tools=[] ) #, tools=['default'] ) + @@ -121,6 +121,7 @@ env.Tool( 'default' ) env.Append( LIBS = ['pthread'], CCFLAGS = "-Wall" ) |