Attachment 150093 Details for Bug 195577 – Proposed patch

[patch] Proposed patch

jsoncpp.patch (text/plain), 1.04 KB, created by Dmitry Marakasov on 2014-12-02 04:05:57 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dmitry Marakasov

Created: 2014-12-02 04:05:57 UTC

Size: 1.04 KB

patch

obsolete

>Index: files/patch-SConstruct
>===================================================================
>--- files/patch-SConstruct	(revision 373729)
>+++ files/patch-SConstruct	(working copy)
>@@ -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" )

Actions: View | Diff

Attachments on bug 195577: 150093