[74598] trunk/dports/python
ram at macports.org
ram at macports.org
Wed Dec 22 12:43:33 PST 2010
Revision: 74598
http://trac.macports.org/changeset/74598
Author: ram at macports.org
Date: 2010-12-22 12:43:27 -0800 (Wed, 22 Dec 2010)
Log Message:
-----------
python/py2{5,6,7}-scipy: add gcc45 variant, closes #27476
Modified Paths:
--------------
trunk/dports/python/py25-scipy/Portfile
trunk/dports/python/py26-scipy/Portfile
trunk/dports/python/py27-scipy/Portfile
Modified: trunk/dports/python/py25-scipy/Portfile
===================================================================
--- trunk/dports/python/py25-scipy/Portfile 2010-12-22 20:43:15 UTC (rev 74597)
+++ trunk/dports/python/py25-scipy/Portfile 2010-12-22 20:43:27 UTC (rev 74598)
@@ -63,7 +63,7 @@
BLAS=${prefix}/lib
}
-variant gcc42 conflicts gcc43 gcc44 description "Use gcc 4.2 tool chain for building" {
+variant gcc42 conflicts gcc43 gcc44 gcc45 description "Use gcc 4.2 tool chain for building" {
configure.compiler macports-gcc-4.2
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"
@@ -77,7 +77,7 @@
CXX="${prefix}/bin/g++-mp-4.2"
}
-variant gcc43 conflicts gcc42 gcc44 description "Use gcc 4.3 tool chain for building" {
+variant gcc43 conflicts gcc42 gcc44 gcc45 description "Use gcc 4.3 tool chain for building" {
configure.compiler macports-gcc-4.3
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"
@@ -91,7 +91,7 @@
CXX="${prefix}/bin/g++-mp-4.3"
}
-variant gcc44 conflicts gcc42 gcc43 description "Use gfortran-mp-4.4 as fortran compiler" {
+variant gcc44 conflicts gcc42 gcc43 gcc45 description "Use gfortran-mp-4.4 as fortran compiler" {
configure.compiler macports-gcc-4.4
depends_lib-append port:gcc44
set fc_options "config_fc --fcompiler gnu95 --f77exec ${prefix}/bin/gfortran-mp-4.4 --f90exec ${prefix}/bin/gfortran-mp-4.4"
@@ -105,7 +105,21 @@
CXX="${prefix}/bin/g++-mp-4.4"
}
-if { ![variant_isset gcc42] && ![variant_isset gcc43] && ![variant_isset gcc44] } {
+variant gcc45 conflicts gcc42 gcc43 gcc44 description "Use gfortran-mp-4.5 as fortran compiler" {
+ configure.compiler macports-gcc-4.5
+ depends_lib-append port:gcc45
+ set fc_options "config_fc --fcompiler gnu95 --f77exec ${prefix}/bin/gfortran-mp-4.5 --f90exec ${prefix}/bin/gfortran-mp-4.5"
+ set config_options "config --cc ${prefix}/bin/gcc-mp-4.4 --include-dirs ${prefix}/include --library-dirs ${prefix}/lib"
+ build.cmd-append ${fc_options} ${config_options}
+ destroot.cmd-append ${fc_options} ${config_options}
+
+ destroot.env-append CC="${prefix}/bin/gcc-mp-4.5" \
+ CXX="${prefix}/bin/g++-mp-4.5"
+ build.env-append CC="${prefix}/bin/gcc-mp-4.5" \
+ CXX="${prefix}/bin/g++-mp-4.5"
+}
+
+if { ![variant_isset gcc42] && ![variant_isset gcc43] && ![variant_isset gcc44] && ![variant_isset gcc44] } {
default_variants +gcc44
}
Modified: trunk/dports/python/py26-scipy/Portfile
===================================================================
--- trunk/dports/python/py26-scipy/Portfile 2010-12-22 20:43:15 UTC (rev 74597)
+++ trunk/dports/python/py26-scipy/Portfile 2010-12-22 20:43:27 UTC (rev 74598)
@@ -55,7 +55,7 @@
BLAS=${prefix}/lib
}
-variant gcc42 conflicts gcc43 gcc44 description "Use gcc 4.2 tool chain for building" {
+variant gcc42 conflicts gcc43 gcc44 gcc45 description "Use gcc 4.2 tool chain for building" {
configure.compiler macports-gcc-4.2
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"
@@ -69,7 +69,7 @@
CXX="${prefix}/bin/g++-mp-4.2"
}
-variant gcc43 conflicts gcc42 gcc44 description "Use gcc 4.3 tool chain for building" {
+variant gcc43 conflicts gcc42 gcc44 gcc45 description "Use gcc 4.3 tool chain for building" {
configure.compiler macports-gcc-4.3
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"
@@ -83,7 +83,7 @@
CXX="${prefix}/bin/g++-mp-4.3"
}
-variant gcc44 conflicts gcc42 gcc43 description "Use gfortran-mp-4.4 as fortran compiler" {
+variant gcc44 conflicts gcc42 gcc43 gcc45 description "Use gfortran-mp-4.4 as fortran compiler" {
configure.compiler macports-gcc-4.4
depends_lib-append port:gcc44
set fc_options "config_fc --fcompiler gnu95 --f77exec ${prefix}/bin/gfortran-mp-4.4 --f90exec ${prefix}/bin/gfortran-mp-4.4"
@@ -97,7 +97,21 @@
CXX="${prefix}/bin/g++-mp-4.4"
}
-if { ![variant_isset gcc42] && ![variant_isset gcc43] && ![variant_isset gcc44] } {
+variant gcc45 conflicts gcc42 gcc43 gcc44 description "Use gfortran-mp-4.5 as fortran compiler" {
+ configure.compiler macports-gcc-4.5
+ depends_lib-append port:gcc45
+ set fc_options "config_fc --fcompiler gnu95 --f77exec ${prefix}/bin/gfortran-mp-4.5 --f90exec ${prefix}/bin/gfortran-mp-4.5"
+ set config_options "config --cc ${prefix}/bin/gcc-mp-4.4 --include-dirs ${prefix}/include --library-dirs ${prefix}/lib"
+ build.cmd-append ${fc_options} ${config_options}
+ destroot.cmd-append ${fc_options} ${config_options}
+
+ destroot.env-append CC="${prefix}/bin/gcc-mp-4.5" \
+ CXX="${prefix}/bin/g++-mp-4.5"
+ build.env-append CC="${prefix}/bin/gcc-mp-4.5" \
+ CXX="${prefix}/bin/g++-mp-4.5"
+}
+
+if { ![variant_isset gcc42] && ![variant_isset gcc43] && ![variant_isset gcc44] && ![variant_isset gcc44] } {
default_variants +gcc44
}
Modified: trunk/dports/python/py27-scipy/Portfile
===================================================================
--- trunk/dports/python/py27-scipy/Portfile 2010-12-22 20:43:15 UTC (rev 74597)
+++ trunk/dports/python/py27-scipy/Portfile 2010-12-22 20:43:27 UTC (rev 74598)
@@ -55,7 +55,7 @@
BLAS=${prefix}/lib
}
-variant gcc42 conflicts gcc43 gcc44 description "Use gcc 4.2 tool chain for building" {
+variant gcc42 conflicts gcc43 gcc44 gcc45 description "Use gcc 4.2 tool chain for building" {
configure.compiler macports-gcc-4.2
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"
@@ -69,7 +69,7 @@
CXX="${prefix}/bin/g++-mp-4.2"
}
-variant gcc43 conflicts gcc42 gcc44 description "Use gcc 4.3 tool chain for building" {
+variant gcc43 conflicts gcc42 gcc44 gcc45 description "Use gcc 4.3 tool chain for building" {
configure.compiler macports-gcc-4.3
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"
@@ -83,7 +83,7 @@
CXX="${prefix}/bin/g++-mp-4.3"
}
-variant gcc44 conflicts gcc42 gcc43 description "Use gfortran-mp-4.4 as fortran compiler" {
+variant gcc44 conflicts gcc42 gcc43 gcc45 description "Use gfortran-mp-4.4 as fortran compiler" {
configure.compiler macports-gcc-4.4
depends_lib-append port:gcc44
set fc_options "config_fc --fcompiler gnu95 --f77exec ${prefix}/bin/gfortran-mp-4.4 --f90exec ${prefix}/bin/gfortran-mp-4.4"
@@ -97,7 +97,21 @@
CXX="${prefix}/bin/g++-mp-4.4"
}
-if { ![variant_isset gcc42] && ![variant_isset gcc43] && ![variant_isset gcc44] } {
+variant gcc45 conflicts gcc42 gcc43 gcc44 description "Use gfortran-mp-4.5 as fortran compiler" {
+ configure.compiler macports-gcc-4.5
+ depends_lib-append port:gcc45
+ set fc_options "config_fc --fcompiler gnu95 --f77exec ${prefix}/bin/gfortran-mp-4.5 --f90exec ${prefix}/bin/gfortran-mp-4.5"
+ set config_options "config --cc ${prefix}/bin/gcc-mp-4.4 --include-dirs ${prefix}/include --library-dirs ${prefix}/lib"
+ build.cmd-append ${fc_options} ${config_options}
+ destroot.cmd-append ${fc_options} ${config_options}
+
+ destroot.env-append CC="${prefix}/bin/gcc-mp-4.5" \
+ CXX="${prefix}/bin/g++-mp-4.5"
+ build.env-append CC="${prefix}/bin/gcc-mp-4.5" \
+ CXX="${prefix}/bin/g++-mp-4.5"
+}
+
+if { ![variant_isset gcc42] && ![variant_isset gcc43] && ![variant_isset gcc44] && ![variant_isset gcc44] } {
default_variants +gcc44
}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20101222/ba80a8cc/attachment.html>
More information about the macports-changes
mailing list