[110169] trunk/dports/python
jeremyhu at macports.org
jeremyhu at macports.org
Tue Aug 27 12:44:42 PDT 2013
Revision: 110169
https://trac.macports.org/changeset/110169
Author: jeremyhu at macports.org
Date: 2013-08-27 12:44:42 -0700 (Tue, 27 Aug 2013)
Log Message:
-----------
multiple: Update fortran recipe to fix conflicts in python ports
Modified Paths:
--------------
trunk/dports/python/py-obspy/Portfile
trunk/dports/python/py-qutip/Portfile
trunk/dports/python/py-scikits-bvp_solver/Portfile
trunk/dports/python/py-scipy/Portfile
trunk/dports/python/py-usadel1/Portfile
Modified: trunk/dports/python/py-obspy/Portfile
===================================================================
--- trunk/dports/python/py-obspy/Portfile 2013-08-27 19:41:46 UTC (rev 110168)
+++ trunk/dports/python/py-obspy/Portfile 2013-08-27 19:44:42 UTC (rev 110169)
@@ -53,7 +53,7 @@
foreach ver ${gcc_versions} {
set ver_no_dot [join [split ${ver} "."] ""]
- variant gcc${ver_no_dot} description {build with gfortran from gcc${ver_no_dot}} {}
+ set variant_line {variant gcc${ver_no_dot} description "build with gfortran from gcc${ver_no_dot}"}
foreach over ${gcc_versions} {
if {${ver} == ${over}} {
@@ -61,9 +61,12 @@
}
set over_no_dot [join [split ${over} "."] ""]
- variant gcc${ver_no_dot} conflicts gcc${over_no_dot} {}
+ append variant_line " conflicts gcc${over_no_dot}"
}
+ append variant_line { {}}
+ eval $variant_line
+
if {[variant_isset gcc${ver_no_dot}]} {
if {${default_fortran_variant} != "+gcc${ver_no_dot}"} {
set default_fortran_variant ""
Modified: trunk/dports/python/py-qutip/Portfile
===================================================================
--- trunk/dports/python/py-qutip/Portfile 2013-08-27 19:41:46 UTC (rev 110168)
+++ trunk/dports/python/py-qutip/Portfile 2013-08-27 19:44:42 UTC (rev 110169)
@@ -47,7 +47,7 @@
foreach ver ${gcc_versions} {
set ver_no_dot [join [split ${ver} "."] ""]
- variant gcc${ver_no_dot} description {build with gfortran from gcc${ver_no_dot}} {}
+ set variant_line {variant gcc${ver_no_dot} description "build with gfortran from gcc${ver_no_dot}"}
foreach over ${gcc_versions} {
if {${ver} == ${over}} {
@@ -55,9 +55,12 @@
}
set over_no_dot [join [split ${over} "."] ""]
- variant gcc${ver_no_dot} conflicts gcc${over_no_dot} {}
+ append variant_line " conflicts gcc${over_no_dot}"
}
+ append variant_line { {}}
+ eval $variant_line
+
if {[variant_isset gcc${ver_no_dot}]} {
if {${default_fortran_variant} != "+gcc${ver_no_dot}"} {
set default_fortran_variant ""
Modified: trunk/dports/python/py-scikits-bvp_solver/Portfile
===================================================================
--- trunk/dports/python/py-scikits-bvp_solver/Portfile 2013-08-27 19:41:46 UTC (rev 110168)
+++ trunk/dports/python/py-scikits-bvp_solver/Portfile 2013-08-27 19:44:42 UTC (rev 110169)
@@ -53,7 +53,7 @@
foreach ver ${gcc_versions} {
set ver_no_dot [join [split ${ver} "."] ""]
- variant gcc${ver_no_dot} description {build with gfortran from gcc${ver_no_dot}} {}
+ set variant_line {variant gcc${ver_no_dot} description "build with gfortran from gcc${ver_no_dot}"}
foreach over ${gcc_versions} {
if {${ver} == ${over}} {
@@ -61,9 +61,12 @@
}
set over_no_dot [join [split ${over} "."] ""]
- variant gcc${ver_no_dot} conflicts gcc${over_no_dot} {}
+ append variant_line " conflicts gcc${over_no_dot}"
}
+ append variant_line { {}}
+ eval $variant_line
+
if {[variant_isset gcc${ver_no_dot}]} {
if {${default_fortran_variant} != "+gcc${ver_no_dot}"} {
set default_fortran_variant ""
Modified: trunk/dports/python/py-scipy/Portfile
===================================================================
--- trunk/dports/python/py-scipy/Portfile 2013-08-27 19:41:46 UTC (rev 110168)
+++ trunk/dports/python/py-scipy/Portfile 2013-08-27 19:44:42 UTC (rev 110169)
@@ -90,7 +90,7 @@
foreach ver ${gcc_versions} {
set ver_no_dot [join [split ${ver} "."] ""]
- variant gcc${ver_no_dot} description {build with gfortran from gcc${ver_no_dot}} {}
+ set variant_line {variant gcc${ver_no_dot} description "build with gfortran from gcc${ver_no_dot}"}
foreach over ${gcc_versions} {
if {${ver} == ${over}} {
@@ -98,9 +98,12 @@
}
set over_no_dot [join [split ${over} "."] ""]
- variant gcc${ver_no_dot} conflicts gcc${over_no_dot} {}
+ append variant_line " conflicts gcc${over_no_dot}"
}
+ append variant_line { {}}
+ eval $variant_line
+
if {[variant_isset gcc${ver_no_dot}]} {
if {${default_fortran_variant} != "+gcc${ver_no_dot}"} {
set default_fortran_variant ""
Modified: trunk/dports/python/py-usadel1/Portfile
===================================================================
--- trunk/dports/python/py-usadel1/Portfile 2013-08-27 19:41:46 UTC (rev 110168)
+++ trunk/dports/python/py-usadel1/Portfile 2013-08-27 19:44:42 UTC (rev 110169)
@@ -41,7 +41,7 @@
foreach ver ${gcc_versions} {
set ver_no_dot [join [split ${ver} "."] ""]
- variant gcc${ver_no_dot} description {build with gfortran from gcc${ver_no_dot}} {}
+ set variant_line {variant gcc${ver_no_dot} description "build with gfortran from gcc${ver_no_dot}"}
foreach over ${gcc_versions} {
if {${ver} == ${over}} {
@@ -49,9 +49,12 @@
}
set over_no_dot [join [split ${over} "."] ""]
- variant gcc${ver_no_dot} conflicts gcc${over_no_dot} {}
+ append variant_line " conflicts gcc${over_no_dot}"
}
+ append variant_line { {}}
+ eval $variant_line
+
if {[variant_isset gcc${ver_no_dot}]} {
if {${default_fortran_variant} != "+gcc${ver_no_dot}"} {
set default_fortran_variant ""
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130827/5f7852e3/attachment.html>
More information about the macports-changes
mailing list