[79044] trunk/dports/python/py25-numpy/files/patch-setup.py.diff

[ryandesign at macports.org]

Revision: 79044
          http://trac.macports.org/changeset/79044
Author:   ryandesign at macports.org
Date:     2011-05-30 23:29:06 -0700 (Mon, 30 May 2011)
Log Message:
-----------
py25-numpy: copy missing patchfile (for universal variant) from py26-numpy

Added Paths:
-----------
    trunk/dports/python/py25-numpy/files/patch-setup.py.diff

Copied: trunk/dports/python/py25-numpy/files/patch-setup.py.diff (from rev 79037, trunk/dports/python/py26-numpy/files/patch-setup.py.diff)
===================================================================
--- trunk/dports/python/py25-numpy/files/patch-setup.py.diff	                        (rev 0)
+++ trunk/dports/python/py25-numpy/files/patch-setup.py.diff	2011-05-31 06:29:06 UTC (rev 79044)
@@ -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)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110530/f50eba3d/attachment.html>