[33371] trunk/dports/python

ram at macports.org ram at macports.org
Fri Jan 25 12:05:50 PST 2008


Revision: 33371
          http://trac.macosforge.org/projects/macports/changeset/33371
Author:   ram at macports.org
Date:     2008-01-25 12:05:46 -0800 (Fri, 25 Jan 2008)

Log Message:
-----------
g95 is currently not a supported fortran compiler, for the Mac OS X
platform, for numpy/scipy as the appropriate linking flags have not been
implemented:
  
http://projects.scipy.org/pipermail/scipy-user/2008-January/015300.html
        
Depend only upon gcc42. Closes #13776.

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

Modified: trunk/dports/python/py-numpy/Portfile
===================================================================
--- trunk/dports/python/py-numpy/Portfile	2008-01-25 18:56:02 UTC (rev 33370)
+++ trunk/dports/python/py-numpy/Portfile	2008-01-25 20:05:46 UTC (rev 33371)
@@ -5,7 +5,7 @@
 
 name                    py-numpy
 version                 1.0.4
-revision                4
+revision                5
 categories              python
 platforms               darwin
 maintainers             ram openmaintainer
@@ -20,23 +20,7 @@
                         sha1 9a1f09358c3310cf990eecd06dc2eb54aec78321 \
                         rmd160 8ac192ad3f36a94a45c26e0c4028fdbb744881f5
 
-depends_lib-append      port:fftw-3
+depends_lib-append      port:gcc42 \
+                        port:fftw-3
 
-variant g95 conflicts gcc42 gcc43 description "Use g95 as fortran compiler" {
-  depends_lib-append    port:g95
-  build.cmd-append      "config_fc --fcompiler gnu95 --f77exec ${prefix}/bin/g95 --f90exec ${prefix}/bin/g95"
-}
-
-variant gcc42 conflicts g95 gcc43 description "Use gfortran as fortran compiler" {
-  depends_lib-append    port:gcc42
-  build.cmd-append      "config_fc --fcompiler gnu95 --f77exec ${prefix}/bin/gfortran-mp-4.2 --f90exec ${prefix}/bin/gfortran-mp-4.2"
-}
-
-variant gcc43 conflicts g95 gcc42 description "Use gfortran as fortran compiler" {
-  depends_lib-append    port:gcc43
-  build.cmd-append      "config_fc --fcompiler gnu95 --f77exec ${prefix}/bin/gfortran-mp-4.3 --f90exec ${prefix}/bin/gfortran-mp-4.3"
-}
-
-if { ![variant_isset g95] && ![variant_isset gcc42] && ![variant_isset gcc43] } {
-  default_variants      +g95
-}
+build.cmd-append        "config_fc --fcompiler gnu95 --f77exec ${prefix}/bin/gfortran-mp-4.2 --f90exec ${prefix}/bin/gfortran-mp-4.2"

Modified: trunk/dports/python/py-scipy/Portfile
===================================================================
--- trunk/dports/python/py-scipy/Portfile	2008-01-25 18:56:02 UTC (rev 33370)
+++ trunk/dports/python/py-scipy/Portfile	2008-01-25 20:05:46 UTC (rev 33371)
@@ -5,7 +5,7 @@
 
 name                    py-scipy
 version                 0.6.0
-revision                2
+revision                3
 categories              python
 platforms               darwin
 maintainers             ram openmaintainer
@@ -20,38 +20,18 @@
                         sha1 65eff3e245f59b2af9adc70fad11daa40f0ba3e0 \
                         rmd160 391f2067f7dcc133e7e8622df93a2a0cd5ebbe5b
 
-depends_lib-append      lib:gnuplot:gnuplot \
+depends_lib-append      port:gcc42 \
+                        lib:gnuplot:gnuplot \
                         port:py-numpy
 
 worksrcdir              ${distname}
 
 build.env               CCFLAGS="-I${prefix}/include -L${prefix}/lib"
 
-variant g95 conflicts gcc42 gcc43 description "Use g95 as fortran compiler" {
-  depends_lib-append    port:g95
-  set fc_options        "config_fc --fcompiler gnu95 --f77exec ${prefix}/bin/g95 --f90exec ${prefix}/bin/g95"
-  build.cmd-append      ${fc_options}
-  destroot.cmd-append   ${fc_options}
-}
+set fc_options          "config_fc --fcompiler gnu95 --f77exec ${prefix}/bin/gfortran-mp-4.2 --f90exec ${prefix}/bin/gfortran-mp-4.2"
+build.cmd-append        ${fc_options}
+destroot.cmd-append     ${fc_options}
 
-variant gcc42 conflicts g95 gcc43 description "Use gfortran as fortran compiler" {
-  depends_lib-append    port:gcc42
-  set fc_options        "config_fc --fcompiler gnu95 --f77exec ${prefix}/bin/gfortran-mp-4.2 --f90exec ${prefix}/bin/gfortran-mp-4.2"
-  build.cmd-append      ${fc_options}
-  destroot.cmd-append   ${fc_options}
-}
-
-variant gcc43 conflicts g95 gcc42 description "Use gfortran as fortran compiler" {
-  depends_lib-append    port:gcc43
-  set fc_options        "config_fc --fcompiler gnu95 --f77exec ${prefix}/bin/gfortran-mp-4.3 --f90exec ${prefix}/bin/gfortran-mp-4.3"
-  build.cmd-append      ${fc_options}
-  destroot.cmd-append   ${fc_options}
-}
-
 variant no_gnuplot description "Don't depend on GNUPlot" {
   depends_lib-delete    lib:gnuplot:gnuplot
 }
-
-if { ![variant_isset g95] && ![variant_isset gcc42] && ![variant_isset gcc43] } {
-  default_variants      +g95
-}

Modified: trunk/dports/python/py25-numpy/Portfile
===================================================================
--- trunk/dports/python/py25-numpy/Portfile	2008-01-25 18:56:02 UTC (rev 33370)
+++ trunk/dports/python/py25-numpy/Portfile	2008-01-25 20:05:46 UTC (rev 33371)
@@ -5,7 +5,7 @@
 
 name                    py25-numpy
 version                 1.0.4
-revision                4
+revision                5
 categories              python
 platforms               darwin
 maintainers             ram openmaintainer
@@ -20,24 +20,8 @@
                         sha1 9a1f09358c3310cf990eecd06dc2eb54aec78321 \
                         rmd160 8ac192ad3f36a94a45c26e0c4028fdbb744881f5
 
-depends_lib-append      port:fftw-3 \
+depends_lib-append      port:gcc42 \
+                        port:fftw-3 \
                         port:py25-hashlib
 
-variant g95 conflicts gcc42 gcc43 description "Use g95 as fortran compiler" {
-  depends_lib-append    port:g95
-  build.cmd-append      "config_fc --fcompiler gnu95 --f77exec ${prefix}/bin/g95 --f90exec ${prefix}/bin/g95"
-}
- 
-variant gcc42 conflicts g95 gcc43 description "Use gfortran as fortran compiler" {
-  depends_lib-append    port:gcc42
-  build.cmd-append      "config_fc --fcompiler gnu95 --f77exec ${prefix}/bin/gfortran-mp-4.2 --f90exec ${prefix}/bin/gfortran-mp-4.2"
-}
-
-variant gcc43 conflicts g95 gcc42 description "Use gfortran as fortran compiler" {
-  depends_lib-append    port:gcc43
-  build.cmd-append      "config_fc --fcompiler gnu95 --f77exec ${prefix}/bin/gfortran-mp-4.3 --f90exec ${prefix}/bin/gfortran-mp-4.3"
-}
-
-if { ![variant_isset g95] && ![variant_isset gcc42] && ![variant_isset gcc43] } {
-  default_variants      +g95
-}
+build.cmd-append        "config_fc --fcompiler gnu95 --f77exec ${prefix}/bin/gfortran-mp-4.2 --f90exec ${prefix}/bin/gfortran-mp-4.2"

Modified: trunk/dports/python/py25-scipy/Portfile
===================================================================
--- trunk/dports/python/py25-scipy/Portfile	2008-01-25 18:56:02 UTC (rev 33370)
+++ trunk/dports/python/py25-scipy/Portfile	2008-01-25 20:05:46 UTC (rev 33371)
@@ -5,7 +5,7 @@
 
 name                    py25-scipy
 version                 0.6.0
-revision                2
+revision                3
 categories              python
 platforms               darwin
 maintainers             ram openmaintainer
@@ -20,38 +20,18 @@
                         sha1 65eff3e245f59b2af9adc70fad11daa40f0ba3e0 \
                         rmd160 391f2067f7dcc133e7e8622df93a2a0cd5ebbe5b
 
-depends_lib-append      lib:gnuplot:gnuplot \
+depends_lib-append      port:gcc42 \
+                        lib:gnuplot:gnuplot \
                         port:py25-numpy
 
 worksrcdir              ${distname}
 
 build.env               CCFLAGS="-I${prefix}/include -L${prefix}/lib"
 
-variant g95 conflicts gcc42 gcc43 description "Use g95 as fortran compiler" {
-  depends_lib-append    port:g95
-  set fc_options        "config_fc --fcompiler gnu95 --f77exec ${prefix}/bin/g95 --f90exec ${prefix}/bin/g95"
-  build.cmd-append      ${fc_options}
-  destroot.cmd-append   ${fc_options}
-}
+set fc_options          "config_fc --fcompiler gnu95 --f77exec ${prefix}/bin/gfortran-mp-4.2 --f90exec ${prefix}/bin/gfortran-mp-4.2"
+build.cmd-append        ${fc_options}
+destroot.cmd-append     ${fc_options}
 
-variant gcc42 conflicts g95 gcc43 description "Use gfortran as fortran compiler" {
-  depends_lib-append    port:gcc42
-  set fc_options        "config_fc --fcompiler gnu95 --f77exec ${prefix}/bin/gfortran-mp-4.2 --f90exec ${prefix}/bin/gfortran-mp-4.2"
-  build.cmd-append      ${fc_options}
-  destroot.cmd-append   ${fc_options}
-}
-
-variant gcc43 conflicts g95 gcc42 description "Use gfortran as fortran compiler" {
-  depends_lib-append    port:gcc43
-  set fc_options        "config_fc --fcompiler gnu95 --f77exec ${prefix}/bin/gfortran-mp-4.3 --f90exec ${prefix}/bin/gfortran-mp-4.3"
-  build.cmd-append      ${fc_options}
-  destroot.cmd-append   ${fc_options}
-}
-
 variant no_gnuplot description "Don't depend on GNUPlot" {
   depends_lib-delete    lib:gnuplot:gnuplot
 }
-
-if { ![variant_isset g95] && ![variant_isset gcc42] && ![variant_isset gcc43] } {
-  default_variants      +g95
-}

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20080125/85ec786d/attachment.html


More information about the macports-changes mailing list