[31331] trunk/dports/python
erickt at macports.org
erickt at macports.org
Tue Nov 20 00:34:34 PST 2007
Revision: 31331
http://trac.macosforge.org/projects/macports/changeset/31331
Author: erickt at macports.org
Date: 2007-11-20 00:34:33 -0800 (Tue, 20 Nov 2007)
Log Message:
-----------
fix install bug for scipy and numpy
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 2007-11-20 05:49:37 UTC (rev 31330)
+++ trunk/dports/python/py-numpy/Portfile 2007-11-20 08:34:33 UTC (rev 31331)
@@ -5,7 +5,7 @@
name py-numpy
version 1.0.4
-revision 1
+revision 3
categories python
platforms darwin
maintainers erickt at macports.org
@@ -22,26 +22,27 @@
depends_lib lib:fftw:fftw-3
-variant g95 conflicts gcc42 gcc43 description "Use g95 as fortran compiler" {
- depends_lib-append port:g95
+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}
+}
+
+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}
+}
+
+if { ![variant_isset g95] && ![variant_isset gcc42] && ![variant_isset gcc43] } {
+ default_variants +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
-}
Modified: trunk/dports/python/py-scipy/Portfile
===================================================================
--- trunk/dports/python/py-scipy/Portfile 2007-11-20 05:49:37 UTC (rev 31330)
+++ trunk/dports/python/py-scipy/Portfile 2007-11-20 08:34:33 UTC (rev 31331)
@@ -5,6 +5,7 @@
name py-scipy
version 0.6.0
+revision 1
categories python
platforms darwin
maintainers erickt at macports.org
@@ -25,3 +26,28 @@
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}
+}
+
+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}
+}
+
+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 2007-11-20 05:49:37 UTC (rev 31330)
+++ trunk/dports/python/py25-numpy/Portfile 2007-11-20 08:34:33 UTC (rev 31331)
@@ -5,7 +5,7 @@
name py25-numpy
version 1.0.4
-revision 1
+revision 3
categories python
platforms darwin
maintainers erickt at macports.org
@@ -23,30 +23,27 @@
depends_lib lib:fftw: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 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}
+}
+
+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}
+}
+
+if { ![variant_isset g95] && ![variant_isset gcc42] && ![variant_isset gcc43] } {
+ default_variants +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
-}
Modified: trunk/dports/python/py25-scipy/Portfile
===================================================================
--- trunk/dports/python/py25-scipy/Portfile 2007-11-20 05:49:37 UTC (rev 31330)
+++ trunk/dports/python/py25-scipy/Portfile 2007-11-20 08:34:33 UTC (rev 31331)
@@ -5,6 +5,7 @@
name py25-scipy
version 0.6.0
+revision 1
categories python
platforms darwin
maintainers erickt at macports.org
@@ -25,3 +26,28 @@
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}
+}
+
+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}
+}
+
+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/20071120/b6c44f6a/attachment.html
More information about the macports-changes
mailing list