[110096] trunk/dports/python/py-scipy/Portfile
jeremyhu at macports.org
jeremyhu at macports.org
Sun Aug 25 23:58:30 PDT 2013
Revision: 110096
https://trac.macports.org/changeset/110096
Author: jeremyhu at macports.org
Date: 2013-08-25 23:58:30 -0700 (Sun, 25 Aug 2013)
Log Message:
-----------
py-scipy: Use fortran recipe to fix build on Mavericks
Modified Paths:
--------------
trunk/dports/python/py-scipy/Portfile
Modified: trunk/dports/python/py-scipy/Portfile
===================================================================
--- trunk/dports/python/py-scipy/Portfile 2013-08-26 06:46:58 UTC (rev 110095)
+++ trunk/dports/python/py-scipy/Portfile 2013-08-26 06:58:30 UTC (rev 110096)
@@ -33,7 +33,7 @@
subport py24-scipy {
# scipy dropped support for Python 2.4 at version 0.12.0
version 0.11.0
- revision 1
+ revision 2
master_sites sourceforge:project/scipy/scipy/${version}/
distname scipy-${version}
checksums rmd160 68c0d13088d898e96c3a7ea4e77f8fc9b49e6c78 \
@@ -43,7 +43,7 @@
subport py25-scipy {
# scipy dropped support for Python 2.5 at version 0.12.0
version 0.11.0
- revision 1
+ revision 2
master_sites sourceforge:project/scipy/scipy/${version}/
distname scipy-${version}
checksums rmd160 68c0d13088d898e96c3a7ea4e77f8fc9b49e6c78 \
@@ -84,75 +84,57 @@
BLAS=${prefix}/lib
}
- variant gcc43 conflicts gcc44 gcc45 gcc46 gcc47 description "Use gcc 4.3 tool chain for building" {
- configure.compiler macports-gcc-4.3
- set fc_options "config_fc --fcompiler gnu95 --f77exec ${prefix}/bin/gfortran-mp-4.3 --f90exec ${prefix}/bin/gfortran-mp-4.3"
- set config_options "config --cc ${prefix}/bin/gcc-mp-4.3 --include-dirs ${prefix}/include --library-dirs ${prefix}/lib"
- build.cmd-append ${fc_options} ${config_options}
- destroot.cmd-append ${fc_options} ${config_options}
+ set gcc_versions {4.3 4.4 4.5 4.6 4.7 4.8 4.9}
+ set default_fortran_variant +gcc48
- destroot.env-append CC="${prefix}/bin/gcc-mp-4.3" \
- CXX="${prefix}/bin/g++-mp-4.3"
- build.env-append CC="${prefix}/bin/gcc-mp-4.3" \
- CXX="${prefix}/bin/g++-mp-4.3"
- }
+ foreach ver ${gcc_versions} {
+ set ver_no_dot [join [split ${ver} "."] ""]
- variant gcc44 conflicts gcc43 gcc45 gcc46 gcc47 description "Use gfortran-mp-4.4 as fortran compiler" {
- configure.compiler macports-gcc-4.4
- set fc_options "config_fc --fcompiler gnu95 --f77exec ${prefix}/bin/gfortran-mp-4.4 --f90exec ${prefix}/bin/gfortran-mp-4.4"
- 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}
+ variant gcc${ver_no_dot} description {build with gfortran from gcc${ver_no_dot}} {}
- destroot.env-append CC="${prefix}/bin/gcc-mp-4.4" \
- CXX="${prefix}/bin/g++-mp-4.4"
- build.env-append CC="${prefix}/bin/gcc-mp-4.4" \
- CXX="${prefix}/bin/g++-mp-4.4"
- }
+ foreach over ${gcc_versions} {
+ if {${ver} == ${over}} {
+ continue
+ }
- variant gcc45 conflicts gcc43 gcc44 gcc46 gcc47 description "Use gfortran-mp-4.5 as fortran compiler" {
- configure.compiler macports-gcc-4.5
- 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.5 --include-dirs ${prefix}/include --library-dirs ${prefix}/lib"
- build.cmd-append ${fc_options} ${config_options}
- destroot.cmd-append ${fc_options} ${config_options}
+ set over_no_dot [join [split ${over} "."] ""]
+ variant gcc${ver_no_dot} conflicts gcc${over_no_dot} {}
+ }
- 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 gcc${ver_no_dot}]} {
+ if {${default_fortran_variant} != "+gcc${ver_no_dot}"} {
+ set default_fortran_variant ""
+ }
+ }
}
- variant gcc46 conflicts gcc43 gcc44 gcc45 gcc47 description "Use gfortran-mp-4.6 as fortran compiler" {
- configure.compiler macports-gcc-4.6
- set fc_options "config_fc --fcompiler gnu95 --f77exec ${prefix}/bin/gfortran-mp-4.6 --f90exec ${prefix}/bin/gfortran-mp-4.6"
- set config_options "config --cc ${prefix}/bin/gcc-mp-4.6 --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.6" \
- CXX="${prefix}/bin/g++-mp-4.6"
- build.env-append CC="${prefix}/bin/gcc-mp-4.6" \
- CXX="${prefix}/bin/g++-mp-4.6"
+ if {${default_fortran_variant} != ""} {
+ default_variants-append "${default_fortran_variant}"
}
- variant gcc47 conflicts gcc43 gcc44 gcc45 gcc46 description "Use gfortran-mp-4.7 as fortran compiler" {
- configure.compiler macports-gcc-4.7
- set fc_options "config_fc --fcompiler gnu95 --f77exec ${prefix}/bin/gfortran-mp-4.7 --f90exec ${prefix}/bin/gfortran-mp-4.7"
- set config_options "config --cc ${prefix}/bin/gcc-mp-4.7 --include-dirs ${prefix}/include --library-dirs ${prefix}/lib"
- build.cmd-append ${fc_options} ${config_options}
- destroot.cmd-append ${fc_options} ${config_options}
+ foreach ver ${gcc_versions} {
+ set ver_no_dot [join [split ${ver} "."] ""]
- destroot.env-append CC="${prefix}/bin/gcc-mp-4.7" \
- CXX="${prefix}/bin/g++-mp-4.7"
- build.env-append CC="${prefix}/bin/gcc-mp-4.7" \
- CXX="${prefix}/bin/g++-mp-4.7"
- }
+ if {[variant_isset gcc${ver_no_dot}]} {
+ depends_lib-append port:libgcc
+ depends_build-append port:gcc${ver_no_dot}
- if { ![variant_isset gcc43] && ![variant_isset gcc44] && ![variant_isset gcc45] && ![variant_isset gcc46]} {
- default_variants +gcc47
+ configure.fc ${prefix}/bin/gfortran-mp-${ver}
+ configure.f77 ${prefix}/bin/gfortran-mp-${ver}
+ configure.f90 ${prefix}/bin/gfortran-mp-${ver}
+ }
}
+ set fc_options "config_fc --fcompiler gnu95 --f77exec ${configure.f77} --f90exec ${configure.f90}"
+ set config_options "config --cc ${configure.cc} --include-dirs ${prefix}/include --library-dirs ${prefix}/lib"
+ build.cmd-append ${fc_options} ${config_options}
+ destroot.cmd-append ${fc_options} ${config_options}
+
+ build.env-append CC="${configure.cc}" \
+ CXX="${configure.cxx}"
+ destroot.env-append CC="${configure.cc}" \
+ CXX="${configure.cxx}"
+
livecheck.type none
} else {
livecheck.type regex
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130825/534dd2c0/attachment.html>
More information about the macports-changes
mailing list