[33616] trunk/dports/python

[ram at macports.org]

Revision: 33616
          http://trac.macosforge.org/projects/macports/changeset/33616
Author:   ram at macports.org
Date:     2008-01-31 08:47:12 -0800 (Thu, 31 Jan 2008)

Log Message:
-----------
py-numpy/py25-numpy: fix linking with g95, patch from #14114

Modified Paths:
--------------
    trunk/dports/python/py-numpy/Portfile
    trunk/dports/python/py25-numpy/Portfile

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

Modified: trunk/dports/python/py-numpy/Portfile
===================================================================
--- trunk/dports/python/py-numpy/Portfile	2008-01-31 16:11:42 UTC (rev 33615)
+++ trunk/dports/python/py-numpy/Portfile	2008-01-31 16:47:12 UTC (rev 33616)
@@ -5,7 +5,7 @@
 
 name                    py-numpy
 version                 1.0.4
-revision                5
+revision                6
 categories              python
 platforms               darwin
 maintainers             ram openmaintainer
@@ -20,7 +20,13 @@
                         sha1 9a1f09358c3310cf990eecd06dc2eb54aec78321 \
                         rmd160 8ac192ad3f36a94a45c26e0c4028fdbb744881f5
 
+patchfiles              patch-g95_link.diff
+
 depends_lib-append      port:gcc42 \
                         port:fftw-3
 
+post-patch {
+  reinplace "s|@@MPORTS_PREFIX@@|${prefix}|" ${worksrcpath}/numpy/distutils/fcompiler/g95.py
+}
+
 build.cmd-append        "config_fc --fcompiler gnu95 --f77exec ${prefix}/bin/gfortran-mp-4.2 --f90exec ${prefix}/bin/gfortran-mp-4.2"

Added: trunk/dports/python/py-numpy/files/patch-g95_link.diff
===================================================================
--- trunk/dports/python/py-numpy/files/patch-g95_link.diff	                        (rev 0)
+++ trunk/dports/python/py-numpy/files/patch-g95_link.diff	2008-01-31 16:47:12 UTC (rev 33616)
@@ -0,0 +1,11 @@
+--- numpy/distutils/fcompiler/g95.py	2007-11-07 17:05:14.000000000 -0500
++++ numpy/distutils/fcompiler/g95.py	2008-01-30 21:26:47.000000000 -0500
+@@ -21,7 +21,7 @@
+         'compiler_f77' : ["g95", "-ffixed-form"],
+         'compiler_fix' : ["g95", "-ffixed-form"],
+         'compiler_f90' : ["g95"],
+-        'linker_so'    : ["<F90>","-shared"],
++        'linker_so'    : ["<F90>","-dynamiclib -L@@MPORTS_PREFIX@@/lib -lpython2.4"],
+         'archiver'     : ["ar", "-cr"],
+         'ranlib'       : ["ranlib"]
+         }

Modified: trunk/dports/python/py25-numpy/Portfile
===================================================================
--- trunk/dports/python/py25-numpy/Portfile	2008-01-31 16:11:42 UTC (rev 33615)
+++ trunk/dports/python/py25-numpy/Portfile	2008-01-31 16:47:12 UTC (rev 33616)
@@ -5,7 +5,7 @@
 
 name                    py25-numpy
 version                 1.0.4
-revision                5
+revision                6
 categories              python
 platforms               darwin
 maintainers             ram openmaintainer
@@ -20,8 +20,14 @@
                         sha1 9a1f09358c3310cf990eecd06dc2eb54aec78321 \
                         rmd160 8ac192ad3f36a94a45c26e0c4028fdbb744881f5
 
+patchfiles              patch-g95_link.diff
+
 depends_lib-append      port:gcc42 \
                         port:fftw-3 \
                         port:py25-hashlib
 
+post-patch {
+  reinplace "s|@@MPORTS_PREFIX@@|${prefix}|" ${worksrcpath}/numpy/distutils/fcompiler/g95.py
+}
+
 build.cmd-append        "config_fc --fcompiler gnu95 --f77exec ${prefix}/bin/gfortran-mp-4.2 --f90exec ${prefix}/bin/gfortran-mp-4.2"

Added: trunk/dports/python/py25-numpy/files/patch-g95_link.diff
===================================================================
--- trunk/dports/python/py25-numpy/files/patch-g95_link.diff	                        (rev 0)
+++ trunk/dports/python/py25-numpy/files/patch-g95_link.diff	2008-01-31 16:47:12 UTC (rev 33616)
@@ -0,0 +1,11 @@
+--- numpy/distutils/fcompiler/g95.py	2007-11-07 17:05:14.000000000 -0500
++++ numpy/distutils/fcompiler/g95.py	2008-01-30 21:26:47.000000000 -0500
+@@ -21,7 +21,7 @@
+         'compiler_f77' : ["g95", "-ffixed-form"],
+         'compiler_fix' : ["g95", "-ffixed-form"],
+         'compiler_f90' : ["g95"],
+-        'linker_so'    : ["<F90>","-shared"],
++        'linker_so'    : ["<F90>","-dynamiclib -L@@MPORTS_PREFIX@@/lib -lpython2.5"],
+         'archiver'     : ["ar", "-cr"],
+         'ranlib'       : ["ranlib"]
+         }

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20080131/4cfb4c76/attachment-0001.html