[59363] trunk/dports/python/py26-scientific/files/patch-Src-MPI-compile.py. diff

[adfernandes at macports.org]

Revision: 59363
          http://trac.macports.org/changeset/59363
Author:   adfernandes at macports.org
Date:     2009-10-13 17:09:25 -0700 (Tue, 13 Oct 2009)
Log Message:
-----------
Closes #22033

Added Paths:
-----------
    trunk/dports/python/py26-scientific/files/patch-Src-MPI-compile.py.diff

Added: trunk/dports/python/py26-scientific/files/patch-Src-MPI-compile.py.diff
===================================================================
--- trunk/dports/python/py26-scientific/files/patch-Src-MPI-compile.py.diff	                        (rev 0)
+++ trunk/dports/python/py26-scientific/files/patch-Src-MPI-compile.py.diff	2009-10-14 00:09:25 UTC (rev 59363)
@@ -0,0 +1,42 @@
+--- Src/MPI/compile.py.orig	2009-10-13 18:42:27.000000000 +0400
++++ Src/MPI/compile.py	2009-10-13 18:42:40.000000000 +0400
+@@ -5,7 +5,6 @@
+ import distutils
+ import distutils.sysconfig
+ import os, sys
+-from Scientific import N
+ 
+ cfgDict = distutils.sysconfig.get_config_vars()
+ 
+@@ -14,11 +13,10 @@
+ sources='mpipython.c Scientific_mpi.c'
+ 
+ extra_compile_args = ""
+-if N.package == "NumPy":
+-    arrayobject_h_include = os.path.join(sys.prefix,
+-                            "lib/python%s.%s/site-packages/numpy/core/include"
+-                                          % sys.version_info [:2])
+-    extra_compile_args = "-DNUMPY=1 -I"+arrayobject_h_include
++arrayobject_h_include = os.path.join(sys.prefix,
++                        "lib/python%s.%s/site-packages/numpy/core/include"
++                                      % sys.version_info [:2])
++extra_compile_args = "-DNUMPY=1 -I"+arrayobject_h_include
+ 
+ linkforshared = cfgDict['LINKFORSHARED']
+ if sys.platform == 'darwin':
+@@ -32,14 +30,12 @@
+             items[i] = os.path.join(frameworkdir[0], items[i])
+     linkforshared = ' '.join(items)
+ 
+-cmd = '%s %s -o mpipython -I%s %s %s -L%s -lpython%s %s %s' % \
++cmd = '%s %s -o mpipython -Wl,-search_paths_first @prefix@/lib/libmpi.a @prefix@/lib/liblam.a -I at worksrcpath@/Include -I%s %s %s %s %s' % \
+     (mpicompiler, 
+      linkforshared,
+      cfgDict['INCLUDEPY'],
+      extra_compile_args,
+      sources,
+-     cfgDict['LIBPL'],
+-     cfgDict['VERSION'], 
+      cfgDict['LIBS'], 
+      cfgDict['LIBM'])
+ 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20091013/c234ae30/attachment.html>