diff options
| author | Liam P. White <inkscapebrony@gmail.com> | 2014-10-17 20:03:14 +0000 |
|---|---|---|
| committer | Liam P. White <inkscapebrony@gmail.com> | 2014-10-17 20:03:14 +0000 |
| commit | 4fc13b246c0c03c26c10c421c63c33331aa57d85 (patch) | |
| tree | 82f8ceea42ace9c0512b6073935e4bd9c3d14f7a /packaging/macosx/ports/python/py25-numpy/files/patch-setup.py.diff | |
| parent | Small warning cleanup (diff) | |
| parent | Port inkscape to librevenge framework for WPG, CDR and VSD imports (diff) | |
| download | inkscape-4fc13b246c0c03c26c10c421c63c33331aa57d85.tar.gz inkscape-4fc13b246c0c03c26c10c421c63c33331aa57d85.zip | |
Update to trunk r13621
(bzr r13341.1.278)
Diffstat (limited to 'packaging/macosx/ports/python/py25-numpy/files/patch-setup.py.diff')
| -rw-r--r-- | packaging/macosx/ports/python/py25-numpy/files/patch-setup.py.diff | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/packaging/macosx/ports/python/py25-numpy/files/patch-setup.py.diff b/packaging/macosx/ports/python/py25-numpy/files/patch-setup.py.diff new file mode 100644 index 000000000..04e3cdd7a --- /dev/null +++ b/packaging/macosx/ports/python/py25-numpy/files/patch-setup.py.diff @@ -0,0 +1,34 @@ +--- numpy/core/setup.py.orig 2009-04-05 04:09:20.000000000 -0400 ++++ numpy/core/setup.py 2009-04-08 19:53:45.000000000 -0400 +@@ -309,7 +309,14 @@ + if isinstance(d,str): + target_f.write('#define %s\n' % (d)) + else: +- target_f.write('#define %s %s\n' % (d[0],d[1])) ++ if d[0]!='SIZEOF_LONG' and d[0]!='SIZEOF_PY_INTPTR_T': ++ target_f.write('#define %s %s\n' % (d[0],d[1])) ++ else: ++ target_f.write('#ifdef __LP64__\n') ++ target_f.write('#define %s %s\n' % (d[0],8)) ++ target_f.write('#else\n') ++ target_f.write('#define %s %s\n' % (d[0],4)) ++ target_f.write('#endif\n') + + # define inline to our keyword, or nothing + target_f.write('#ifndef __cplusplus\n') +@@ -393,7 +393,14 @@ + if isinstance(d,str): + target_f.write('#define %s\n' % (d)) + else: +- target_f.write('#define %s %s\n' % (d[0],d[1])) ++ if d[0]!='NPY_SIZEOF_LONG' and d[0]!='NPY_SIZEOF_PY_INTPTR_T': ++ target_f.write('#define %s %s\n' % (d[0],d[1])) ++ else: ++ target_f.write('#ifdef __LP64__\n') ++ target_f.write('#define %s %s\n' % (d[0],8)) ++ target_f.write('#else\n') ++ target_f.write('#define %s %s\n' % (d[0],4)) ++ target_f.write('#endif\n') + + # define NPY_INLINE to recognized keyword + target_f.write('#define NPY_INLINE %s\n' % inline) |