[81036] trunk/dports/python

jmr at macports.org jmr at macports.org
Sat Jul 23 20:14:20 PDT 2011 

Revision: 81036
          http://trac.macports.org/changeset/81036
Author:   jmr at macports.org
Date:     2011-07-23 20:14:17 -0700 (Sat, 23 Jul 2011)
Log Message:
-----------
py*-scipy: fix build on Lion (#30327)

Modified Paths:
--------------
    trunk/dports/python/py-scipy/Portfile
    trunk/dports/python/py25-scipy/Portfile
    trunk/dports/python/py26-scipy/Portfile
    trunk/dports/python/py27-scipy/Portfile
    trunk/dports/python/py31-scipy/Portfile
    trunk/dports/python/py32-scipy/Portfile

Added Paths:
-----------
    trunk/dports/python/py-scipy/files/
    trunk/dports/python/py-scipy/files/scipy_complex.patch
    trunk/dports/python/py25-scipy/files/
    trunk/dports/python/py25-scipy/files/scipy_complex.patch
    trunk/dports/python/py26-scipy/files/
    trunk/dports/python/py26-scipy/files/scipy_complex.patch
    trunk/dports/python/py27-scipy/files/
    trunk/dports/python/py27-scipy/files/scipy_complex.patch
    trunk/dports/python/py31-scipy/files/
    trunk/dports/python/py31-scipy/files/scipy_complex.patch
    trunk/dports/python/py32-scipy/files/
    trunk/dports/python/py32-scipy/files/scipy_complex.patch

Modified: trunk/dports/python/py-scipy/Portfile
===================================================================
--- trunk/dports/python/py-scipy/Portfile	2011-07-24 02:22:39 UTC (rev 81035)
+++ trunk/dports/python/py-scipy/Portfile	2011-07-24 03:14:17 UTC (rev 81036)
@@ -34,6 +34,7 @@
 python.add_archflags    no
 universal_variant       no
 
+patchfiles              scipy_complex.patch
 post-patch {
   reinplace "s|include <\\(umfpack\.*.h\\)>|include <${prefix}/include/ufsparse/\\1>|g" ${worksrcpath}/scipy/sparse/linalg/dsolve/umfpack/umfpack.i
 }

Added: trunk/dports/python/py-scipy/files/scipy_complex.patch
===================================================================
--- trunk/dports/python/py-scipy/files/scipy_complex.patch	                        (rev 0)
+++ trunk/dports/python/py-scipy/files/scipy_complex.patch	2011-07-24 03:14:17 UTC (rev 81036)
@@ -0,0 +1,24 @@
+--- scipy/sparse/linalg/eigen/arpack/ARPACK/FWRAPPERS/veclib_cabi_c.c.orig	2011-07-23 09:13:17.000000000 -0400
++++ scipy/sparse/linalg/eigen/arpack/ARPACK/FWRAPPERS/veclib_cabi_c.c	2011-07-23 09:13:33.000000000 -0400
+@@ -1,4 +1,5 @@
+ #include <vecLib/vecLib.h>
++#include <complex.h>
+ 
+ #define WRAP_F77(a) a##_
+ void WRAP_F77(veclib_cdotc)(const int *N, const complex float *X, const int *incX,
+--- scipy/lib/blas/fblaswrap_veclib_c.c.src.orig	2011-07-23 09:33:44.000000000 -0400
++++ scipy/lib/blas/fblaswrap_veclib_c.c.src	2011-07-23 09:33:58.000000000 -0400
+@@ -1,4 +1,5 @@
+ #include <vecLib/vecLib.h>
++#include <complex.h>
+ 
+ //#define WRAP_F77(a) wcblas_##a##_
+ #define WRAP_F77(a) w##a##_
+--- scipy/linalg/src/fblaswrap_veclib_c.c.orig	2011-07-23 09:38:19.000000000 -0400
++++ scipy/linalg/src/fblaswrap_veclib_c.c	2011-07-23 09:38:31.000000000 -0400
+@@ -1,4 +1,5 @@
+ #include <vecLib/vecLib.h>
++#include <complex.h>
+ 
+ //#define WRAP_F77(a) wcblas_##a##_
+ #define WRAP_F77(a) w##a##_

Modified: trunk/dports/python/py25-scipy/Portfile
===================================================================
--- trunk/dports/python/py25-scipy/Portfile	2011-07-24 02:22:39 UTC (rev 81035)
+++ trunk/dports/python/py25-scipy/Portfile	2011-07-24 03:14:17 UTC (rev 81036)
@@ -35,6 +35,7 @@
 python.add_archflags    no
 universal_variant       no
 
+patchfiles              scipy_complex.patch
 post-patch {
   reinplace "s|include <\\(umfpack\.*.h\\)>|include <${prefix}/include/ufsparse/\\1>|g" ${worksrcpath}/scipy/sparse/linalg/dsolve/umfpack/umfpack.i
 }

Added: trunk/dports/python/py25-scipy/files/scipy_complex.patch
===================================================================
--- trunk/dports/python/py25-scipy/files/scipy_complex.patch	                        (rev 0)
+++ trunk/dports/python/py25-scipy/files/scipy_complex.patch	2011-07-24 03:14:17 UTC (rev 81036)
@@ -0,0 +1,24 @@
+--- scipy/sparse/linalg/eigen/arpack/ARPACK/FWRAPPERS/veclib_cabi_c.c.orig	2011-07-23 09:13:17.000000000 -0400
++++ scipy/sparse/linalg/eigen/arpack/ARPACK/FWRAPPERS/veclib_cabi_c.c	2011-07-23 09:13:33.000000000 -0400
+@@ -1,4 +1,5 @@
+ #include <vecLib/vecLib.h>
++#include <complex.h>
+ 
+ #define WRAP_F77(a) a##_
+ void WRAP_F77(veclib_cdotc)(const int *N, const complex float *X, const int *incX,
+--- scipy/lib/blas/fblaswrap_veclib_c.c.src.orig	2011-07-23 09:33:44.000000000 -0400
++++ scipy/lib/blas/fblaswrap_veclib_c.c.src	2011-07-23 09:33:58.000000000 -0400
+@@ -1,4 +1,5 @@
+ #include <vecLib/vecLib.h>
++#include <complex.h>
+ 
+ //#define WRAP_F77(a) wcblas_##a##_
+ #define WRAP_F77(a) w##a##_
+--- scipy/linalg/src/fblaswrap_veclib_c.c.orig	2011-07-23 09:38:19.000000000 -0400
++++ scipy/linalg/src/fblaswrap_veclib_c.c	2011-07-23 09:38:31.000000000 -0400
+@@ -1,4 +1,5 @@
+ #include <vecLib/vecLib.h>
++#include <complex.h>
+ 
+ //#define WRAP_F77(a) wcblas_##a##_
+ #define WRAP_F77(a) w##a##_

Modified: trunk/dports/python/py26-scipy/Portfile
===================================================================
--- trunk/dports/python/py26-scipy/Portfile	2011-07-24 02:22:39 UTC (rev 81035)
+++ trunk/dports/python/py26-scipy/Portfile	2011-07-24 03:14:17 UTC (rev 81036)
@@ -32,6 +32,7 @@
 
 destroot.env-append     CCFLAGS="-I${prefix}/include -L${prefix}/lib"
 
+patchfiles              scipy_complex.patch
 post-patch {
   reinplace "s|include <\\(umfpack\.*.h\\)>|include <${prefix}/include/ufsparse/\\1>|g" ${worksrcpath}/scipy/sparse/linalg/dsolve/umfpack/umfpack.i
 }

Added: trunk/dports/python/py26-scipy/files/scipy_complex.patch
===================================================================
--- trunk/dports/python/py26-scipy/files/scipy_complex.patch	                        (rev 0)
+++ trunk/dports/python/py26-scipy/files/scipy_complex.patch	2011-07-24 03:14:17 UTC (rev 81036)
@@ -0,0 +1,24 @@
+--- scipy/sparse/linalg/eigen/arpack/ARPACK/FWRAPPERS/veclib_cabi_c.c.orig	2011-07-23 09:13:17.000000000 -0400
++++ scipy/sparse/linalg/eigen/arpack/ARPACK/FWRAPPERS/veclib_cabi_c.c	2011-07-23 09:13:33.000000000 -0400
+@@ -1,4 +1,5 @@
+ #include <vecLib/vecLib.h>
++#include <complex.h>
+ 
+ #define WRAP_F77(a) a##_
+ void WRAP_F77(veclib_cdotc)(const int *N, const complex float *X, const int *incX,
+--- scipy/lib/blas/fblaswrap_veclib_c.c.src.orig	2011-07-23 09:33:44.000000000 -0400
++++ scipy/lib/blas/fblaswrap_veclib_c.c.src	2011-07-23 09:33:58.000000000 -0400
+@@ -1,4 +1,5 @@
+ #include <vecLib/vecLib.h>
++#include <complex.h>
+ 
+ //#define WRAP_F77(a) wcblas_##a##_
+ #define WRAP_F77(a) w##a##_
+--- scipy/linalg/src/fblaswrap_veclib_c.c.orig	2011-07-23 09:38:19.000000000 -0400
++++ scipy/linalg/src/fblaswrap_veclib_c.c	2011-07-23 09:38:31.000000000 -0400
+@@ -1,4 +1,5 @@
+ #include <vecLib/vecLib.h>
++#include <complex.h>
+ 
+ //#define WRAP_F77(a) wcblas_##a##_
+ #define WRAP_F77(a) w##a##_

Modified: trunk/dports/python/py27-scipy/Portfile
===================================================================
--- trunk/dports/python/py27-scipy/Portfile	2011-07-24 02:22:39 UTC (rev 81035)
+++ trunk/dports/python/py27-scipy/Portfile	2011-07-24 03:14:17 UTC (rev 81036)
@@ -32,6 +32,7 @@
 
 destroot.env-append     CCFLAGS="-I${prefix}/include -L${prefix}/lib"
 
+patchfiles              scipy_complex.patch
 post-patch {
   reinplace "s|include <\\(umfpack\.*.h\\)>|include <${prefix}/include/ufsparse/\\1>|g" ${worksrcpath}/scipy/sparse/linalg/dsolve/umfpack/umfpack.i
 }

Added: trunk/dports/python/py27-scipy/files/scipy_complex.patch
===================================================================
--- trunk/dports/python/py27-scipy/files/scipy_complex.patch	                        (rev 0)
+++ trunk/dports/python/py27-scipy/files/scipy_complex.patch	2011-07-24 03:14:17 UTC (rev 81036)
@@ -0,0 +1,24 @@
+--- scipy/sparse/linalg/eigen/arpack/ARPACK/FWRAPPERS/veclib_cabi_c.c.orig	2011-07-23 09:13:17.000000000 -0400
++++ scipy/sparse/linalg/eigen/arpack/ARPACK/FWRAPPERS/veclib_cabi_c.c	2011-07-23 09:13:33.000000000 -0400
+@@ -1,4 +1,5 @@
+ #include <vecLib/vecLib.h>
++#include <complex.h>
+ 
+ #define WRAP_F77(a) a##_
+ void WRAP_F77(veclib_cdotc)(const int *N, const complex float *X, const int *incX,
+--- scipy/lib/blas/fblaswrap_veclib_c.c.src.orig	2011-07-23 09:33:44.000000000 -0400
++++ scipy/lib/blas/fblaswrap_veclib_c.c.src	2011-07-23 09:33:58.000000000 -0400
+@@ -1,4 +1,5 @@
+ #include <vecLib/vecLib.h>
++#include <complex.h>
+ 
+ //#define WRAP_F77(a) wcblas_##a##_
+ #define WRAP_F77(a) w##a##_
+--- scipy/linalg/src/fblaswrap_veclib_c.c.orig	2011-07-23 09:38:19.000000000 -0400
++++ scipy/linalg/src/fblaswrap_veclib_c.c	2011-07-23 09:38:31.000000000 -0400
+@@ -1,4 +1,5 @@
+ #include <vecLib/vecLib.h>
++#include <complex.h>
+ 
+ //#define WRAP_F77(a) wcblas_##a##_
+ #define WRAP_F77(a) w##a##_

Modified: trunk/dports/python/py31-scipy/Portfile
===================================================================
--- trunk/dports/python/py31-scipy/Portfile	2011-07-24 02:22:39 UTC (rev 81035)
+++ trunk/dports/python/py31-scipy/Portfile	2011-07-24 03:14:17 UTC (rev 81036)
@@ -32,6 +32,7 @@
 
 destroot.env-append     CCFLAGS="-I${prefix}/include -L${prefix}/lib"
 
+patchfiles              scipy_complex.patch
 post-patch {
   reinplace "s|include <\\(umfpack\.*.h\\)>|include <${prefix}/include/ufsparse/\\1>|g" ${worksrcpath}/scipy/sparse/linalg/dsolve/umfpack/umfpack.i
 }

Added: trunk/dports/python/py31-scipy/files/scipy_complex.patch
===================================================================
--- trunk/dports/python/py31-scipy/files/scipy_complex.patch	                        (rev 0)
+++ trunk/dports/python/py31-scipy/files/scipy_complex.patch	2011-07-24 03:14:17 UTC (rev 81036)
@@ -0,0 +1,24 @@
+--- scipy/sparse/linalg/eigen/arpack/ARPACK/FWRAPPERS/veclib_cabi_c.c.orig	2011-07-23 09:13:17.000000000 -0400
++++ scipy/sparse/linalg/eigen/arpack/ARPACK/FWRAPPERS/veclib_cabi_c.c	2011-07-23 09:13:33.000000000 -0400
+@@ -1,4 +1,5 @@
+ #include <vecLib/vecLib.h>
++#include <complex.h>
+ 
+ #define WRAP_F77(a) a##_
+ void WRAP_F77(veclib_cdotc)(const int *N, const complex float *X, const int *incX,
+--- scipy/lib/blas/fblaswrap_veclib_c.c.src.orig	2011-07-23 09:33:44.000000000 -0400
++++ scipy/lib/blas/fblaswrap_veclib_c.c.src	2011-07-23 09:33:58.000000000 -0400
+@@ -1,4 +1,5 @@
+ #include <vecLib/vecLib.h>
++#include <complex.h>
+ 
+ //#define WRAP_F77(a) wcblas_##a##_
+ #define WRAP_F77(a) w##a##_
+--- scipy/linalg/src/fblaswrap_veclib_c.c.orig	2011-07-23 09:38:19.000000000 -0400
++++ scipy/linalg/src/fblaswrap_veclib_c.c	2011-07-23 09:38:31.000000000 -0400
+@@ -1,4 +1,5 @@
+ #include <vecLib/vecLib.h>
++#include <complex.h>
+ 
+ //#define WRAP_F77(a) wcblas_##a##_
+ #define WRAP_F77(a) w##a##_

Modified: trunk/dports/python/py32-scipy/Portfile
===================================================================
--- trunk/dports/python/py32-scipy/Portfile	2011-07-24 02:22:39 UTC (rev 81035)
+++ trunk/dports/python/py32-scipy/Portfile	2011-07-24 03:14:17 UTC (rev 81036)
@@ -32,6 +32,7 @@
 
 destroot.env-append     CCFLAGS="-I${prefix}/include -L${prefix}/lib"
 
+patchfiles              scipy_complex.patch
 post-patch {
   reinplace "s|include <\\(umfpack\.*.h\\)>|include <${prefix}/include/ufsparse/\\1>|g" ${worksrcpath}/scipy/sparse/linalg/dsolve/umfpack/umfpack.i
 }

Added: trunk/dports/python/py32-scipy/files/scipy_complex.patch
===================================================================
--- trunk/dports/python/py32-scipy/files/scipy_complex.patch	                        (rev 0)
+++ trunk/dports/python/py32-scipy/files/scipy_complex.patch	2011-07-24 03:14:17 UTC (rev 81036)
@@ -0,0 +1,24 @@
+--- scipy/sparse/linalg/eigen/arpack/ARPACK/FWRAPPERS/veclib_cabi_c.c.orig	2011-07-23 09:13:17.000000000 -0400
++++ scipy/sparse/linalg/eigen/arpack/ARPACK/FWRAPPERS/veclib_cabi_c.c	2011-07-23 09:13:33.000000000 -0400
+@@ -1,4 +1,5 @@
+ #include <vecLib/vecLib.h>
++#include <complex.h>
+ 
+ #define WRAP_F77(a) a##_
+ void WRAP_F77(veclib_cdotc)(const int *N, const complex float *X, const int *incX,
+--- scipy/lib/blas/fblaswrap_veclib_c.c.src.orig	2011-07-23 09:33:44.000000000 -0400
++++ scipy/lib/blas/fblaswrap_veclib_c.c.src	2011-07-23 09:33:58.000000000 -0400
+@@ -1,4 +1,5 @@
+ #include <vecLib/vecLib.h>
++#include <complex.h>
+ 
+ //#define WRAP_F77(a) wcblas_##a##_
+ #define WRAP_F77(a) w##a##_
+--- scipy/linalg/src/fblaswrap_veclib_c.c.orig	2011-07-23 09:38:19.000000000 -0400
++++ scipy/linalg/src/fblaswrap_veclib_c.c	2011-07-23 09:38:31.000000000 -0400
+@@ -1,4 +1,5 @@
+ #include <vecLib/vecLib.h>
++#include <complex.h>
+ 
+ //#define WRAP_F77(a) wcblas_##a##_
+ #define WRAP_F77(a) w##a##_
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110723/3be5ab6f/attachment-0001.html>

More information about the macports-changes mailing list