summaryrefslogtreecommitdiff
path: root/graphics/mypaint/files/patch-SConstruct
diff options
context:
space:
mode:
Diffstat (limited to 'graphics/mypaint/files/patch-SConstruct')
-rw-r--r--graphics/mypaint/files/patch-SConstruct19
1 files changed, 10 insertions, 9 deletions
diff --git a/graphics/mypaint/files/patch-SConstruct b/graphics/mypaint/files/patch-SConstruct
index bd37f1814270..70c7c94b9145 100644
--- a/graphics/mypaint/files/patch-SConstruct
+++ b/graphics/mypaint/files/patch-SConstruct
@@ -1,18 +1,19 @@
---- SConstruct.orig 2009-06-04 14:34:58.000000000 +0400
-+++ SConstruct 2009-06-16 20:30:45.000000000 +0400
-@@ -31,13 +31,13 @@
- optfile.close()
- opts = Options('options.cache', ARGUMENTS)
- opts.Add(PathOption('prefix', 'autotools-style installation prefix', '/usr/local', PathOption.PathAccept))
+--- SConstruct.orig 2010-01-29 14:17:02.000000000 +0300
++++ SConstruct 2010-01-29 19:33:39.000000000 +0300
+@@ -23,14 +23,14 @@
+ opts = Variables()
+ opts.Add(PathVariable('prefix', 'autotools-style installation prefix', '/usr/local', validator=PathVariable.PathIsDirCreate))
+ opts.Add(BoolVariable('debug', 'enable HEAVY_DEBUG and disable optimizations', False))
-env = Environment(ENV=os.environ, options=opts)
+env = Environment(ENV=os.environ, options=opts, **dict((k, v.split()) for k, v in ARGUMENTS.iteritems()))
+ if sys.platform == "win32":
+ env = Environment(tools=['mingw'], ENV=os.environ, options=opts)
opts.Update(env)
- opts.Save('options.cache', env)
env.ParseConfig('pkg-config --cflags --libs glib-2.0')
-env.Append(CXXFLAGS=' -Wall -Wno-sign-compare -Wno-write-strings')
+env.Append(CXXFLAGS=['-Wall', '-Wno-sign-compare', '-Wno-write-strings'])
- #env.Append(CXXFLAGS=' -O0', LINKFLAGS=' -O0')
- #env.Append(CXXFLAGS=' -O3', LINKFLAGS=' -O3')
+ # Get the numpy include path (for numpy/arrayobject.h).
+ numpy_path = numpy.get_include()