[113429] trunk/dports/python/py-numpy/files/patch-setup.py.diff
jeremyhu at macports.org
jeremyhu at macports.org
Fri Nov 15 15:07:30 PST 2013
Revision: 113429
https://trac.macports.org/changeset/113429
Author: jeremyhu at macports.org
Date: 2013-11-15 15:07:30 -0800 (Fri, 15 Nov 2013)
Log Message:
-----------
py-numpy: Build fix
Modified Paths:
--------------
trunk/dports/python/py-numpy/files/patch-setup.py.diff
Modified: trunk/dports/python/py-numpy/files/patch-setup.py.diff
===================================================================
--- trunk/dports/python/py-numpy/files/patch-setup.py.diff 2013-11-15 22:59:00 UTC (rev 113428)
+++ trunk/dports/python/py-numpy/files/patch-setup.py.diff 2013-11-15 23:07:30 UTC (rev 113429)
@@ -1,33 +1,33 @@
--- 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):
+ if isinstance(d, str):
target_f.write('#define %s\n' % (d))
else:
-- target_f.write('#define %s %s\n' % (d[0],d[1]))
+- 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]))
++ 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('#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('#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):
+ if isinstance(d, str):
target_f.write('#define %s\n' % (d))
else:
-- target_f.write('#define %s %s\n' % (d[0],d[1]))
+- 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]))
++ 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('#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('#define %s %s\n' % (d[0], 4))
+ target_f.write('#endif\n')
# define NPY_INLINE to recognized keyword
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20131115/1b2543ad/attachment-0001.html>
More information about the macports-changes
mailing list