diff options
| author | Shlomi Fish <shlomif@shlomifish.org> | 2017-01-03 23:18:39 +0000 |
|---|---|---|
| committer | Shlomi Fish <shlomif@shlomifish.org> | 2017-01-03 23:18:39 +0000 |
| commit | 20124f96375afdfbf8ab58b6090db95ba0d2687b (patch) | |
| tree | 0f7e003dd9707b751c3b51e7b8133a21437ead95 /packaging/macosx/ports/python/py25-numpy/files/patch-setup.py.diff | |
| parent | Merged. (diff) | |
| parent | Fix build on Windows (see http://inkscape.13.x6.nabble.com/compile-error-on-W... (diff) | |
| download | inkscape-20124f96375afdfbf8ab58b6090db95ba0d2687b.tar.gz inkscape-20124f96375afdfbf8ab58b6090db95ba0d2687b.zip | |
Merged.
(bzr r15369.1.5)
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, 0 insertions, 34 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 deleted file mode 100644 index 04e3cdd7a..000000000 --- a/packaging/macosx/ports/python/py25-numpy/files/patch-setup.py.diff +++ /dev/null @@ -1,34 +0,0 @@ ---- 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) |