[110107] trunk/dports/python
jeremyhu at macports.org
jeremyhu at macports.org
Mon Aug 26 01:27:50 PDT 2013
Revision: 110107
https://trac.macports.org/changeset/110107
Author: jeremyhu at macports.org
Date: 2013-08-26 01:27:50 -0700 (Mon, 26 Aug 2013)
Log Message:
-----------
py26-{nio,ngl}: Use fortran variant, and not universal. Fixes build on Mavericks
Modified Paths:
--------------
trunk/dports/python/py-obspy/Portfile
trunk/dports/python/py-qutip/Portfile
trunk/dports/python/py26-ngl/Portfile
trunk/dports/python/py26-nio/Portfile
Modified: trunk/dports/python/py-obspy/Portfile
===================================================================
--- trunk/dports/python/py-obspy/Portfile 2013-08-26 08:15:41 UTC (rev 110106)
+++ trunk/dports/python/py-obspy/Portfile 2013-08-26 08:27:50 UTC (rev 110107)
@@ -45,28 +45,4 @@
universal_variant no
patchfiles patch-setup.py.diff
-
- variant gcc43 conflicts gcc44 gcc45 gcc46 gcc47 description {Compile with gcc 4.3} {
- configure.compiler macports-gcc-4.3
- }
-
- variant gcc44 conflicts gcc43 gcc45 gcc46 gcc47 description {Compile with gcc 4.4} {
- configure.compiler macports-gcc-4.4
- }
-
- variant gcc45 conflicts gcc43 gcc44 gcc46 gcc47 description {Compile with gcc 4.5} {
- configure.compiler macports-gcc-4.5
- }
-
- variant gcc46 conflicts gcc43 gcc44 gcc45 gcc47 description {Compile with gcc 4.6} {
- configure.compiler macports-gcc-4.6
- }
-
- variant gcc47 conflicts gcc43 gcc44 gcc45 gcc46 description {Compile with gcc 4.7} {
- configure.compiler macports-gcc-4.7
- }
-
- if {![variant_isset gcc43] && ![variant_isset gcc44] && ![variant_isset gcc45] && ![variant_isset gcc46] && ![variant_isset gcc47]} {
- default_variants +gcc47
- }
}
Modified: trunk/dports/python/py-qutip/Portfile
===================================================================
--- trunk/dports/python/py-qutip/Portfile 2013-08-26 08:15:41 UTC (rev 110106)
+++ trunk/dports/python/py-qutip/Portfile 2013-08-26 08:27:50 UTC (rev 110107)
@@ -7,6 +7,7 @@
name py-qutip
version 2.2.0
+revision 1
categories-append science
platforms darwin
license GPL-3
@@ -25,6 +26,7 @@
python.versions 26 27
+# py-scipy is not universal
if {$subport != $name} {
depends_lib-append port:py${python.version}-cython \
port:py${python.version}-ipython \
@@ -39,55 +41,62 @@
require_active_variants py${python.version}-matplotlib latex
require_active_variants vtk5 "python${python.version} qt4_mac"
- use_parallel_build no
+ set gcc_versions {4.3 4.4 4.5 4.6 4.7 4.8 4.9}
+ set default_fortran_variant +gcc48
- if {[variant_isset gcc47] || [variant_isset gcc48] || [variant_isset gcc49]} {
- if {[variant_exists universal] && [variant_isset universal]} {
- build.env-append CFLAGS="${configure.universal_cflags}" \
- OBJCFLAGS="${configure.universal_cflags}" \
- CXXFLAGS="${configure.universal_cxxflags}" \
- LDFLAGS="-undefined dynamic_lookup -bundle ${configure.universal_ldflags}"
- } else {
- build.env-append CFLAGS="${configure.cc_archflags}" \
- OBJCFLAGS="${configure.objc_archflags}" \
- CXXFLAGS="${configure.cxx_archflags}" \
- FFLAGS="${configure.f77_archflags}" \
- F90FLAGS="${configure.f90_archflags}" \
- FCFLAGS="${configure.fc_archflags}" \
- LDFLAGS="-undefined dynamic_lookup -bundle ${configure.ld_archflags}"
- }
- }
+ foreach ver ${gcc_versions} {
+ set ver_no_dot [join [split ${ver} "."] ""]
- variant gcc47 conflicts gcc48 gcc49 description "Install Monte Carlo solver using gcc 4.7 gfortran as Fortran compiler" {
- configure.compiler macports-gcc-4.7
+ variant gcc${ver_no_dot} description {build with gfortran from gcc${ver_no_dot}} {}
- python.add_archflags no
+ foreach over ${gcc_versions} {
+ if {${ver} == ${over}} {
+ continue
+ }
- build.args
- build.post_args-append --with-f90mc
+ set over_no_dot [join [split ${over} "."] ""]
+ variant gcc${ver_no_dot} conflicts gcc${over_no_dot} {}
+ }
+
+ if {[variant_isset gcc${ver_no_dot}]} {
+ if {${default_fortran_variant} != "+gcc${ver_no_dot}"} {
+ set default_fortran_variant ""
+ }
+ }
}
- variant gcc48 conflicts gcc47 gcc49 description "Install Monte Carlo solver using gcc 4.8 gfortran as Fortran compiler" {
- configure.compiler macports-gcc-4.8
+ if {${default_fortran_variant} != ""} {
+ default_variants-append "${default_fortran_variant}"
+ }
- python.add_archflags no
+ foreach ver ${gcc_versions} {
+ set ver_no_dot [join [split ${ver} "."] ""]
- build.args
- build.post_args-append --with-f90mc
+ if {[variant_isset gcc${ver_no_dot}]} {
+ depends_lib-append port:libgcc
+ depends_build-append port:gcc${ver_no_dot}
+
+ configure.fc ${prefix}/bin/gfortran-mp-${ver}
+ configure.f77 ${prefix}/bin/gfortran-mp-${ver}
+ configure.f90 ${prefix}/bin/gfortran-mp-${ver}
+ }
}
- variant gcc49 conflicts gcc47 gcc48 description "Install Monte Carlo solver using gcc 4.9 gfortran as Fortran compiler" {
- configure.compiler macports-gcc-4.9
+ use_parallel_build no
- python.add_archflags no
+ python.add_archflags no
+ universal_variant no
- build.args
- build.post_args-append --with-f90mc
- }
+ build.args
+ build.post_args-append --with-f90mc
- if { ![variant_isset gcc48] && ![variant_isset gcc49]} {
- default_variants +gcc47
- }
+ build.env-append CFLAGS="${configure.cc_archflags}" \
+ OBJCFLAGS="${configure.objc_archflags}" \
+ CXXFLAGS="${configure.cxx_archflags}" \
+ FFLAGS="${configure.f77_archflags}" \
+ F90FLAGS="${configure.f90_archflags}" \
+ FCFLAGS="${configure.fc_archflags}" \
+ LDFLAGS="-undefined dynamic_lookup -bundle ${configure.ld_archflags}"
livecheck.type none
} else {
Modified: trunk/dports/python/py26-ngl/Portfile
===================================================================
--- trunk/dports/python/py26-ngl/Portfile 2013-08-26 08:15:41 UTC (rev 110106)
+++ trunk/dports/python/py26-ngl/Portfile 2013-08-26 08:27:50 UTC (rev 110107)
@@ -37,6 +37,9 @@
reinplace "s|py_cmd = 'python'|py_cmd = '${prefix}/bin/python2.6'|" ${worksrcpath}/examples/pynglex
}
+# ncarg is not universal (and thus py26-nio is not universal)
+universal_variant no
+
depends_lib-append port:py26-nio
build.env PNG_PREFIX=${prefix} \
@@ -44,49 +47,74 @@
NCARG_ROOT=${prefix}
destroot.env NCARG_ROOT=${prefix}
-if {![variant_isset g95] && ![variant_isset gcc43] && ![variant_isset gcc44] && ![variant_isset gcc45] && ![variant_isset gcc46] && ![variant_isset universal]} {
- default_variants +gcc47
-}
+set gcc_versions {4.3 4.4 4.5 4.6 4.7 4.8 4.9}
+set default_fortran_variant +gcc48
-variant gcc43 conflicts g95 gcc44 gcc45 gcc46 gcc47 universal description {link to libraries build with gfortran 4.3} {
- configure.compiler macports-gcc-4.3
- build.env-append F2CLIBS=gfortran \
- F2CLIBS_PREFIX=${prefix}/lib/gcc43 \
- CC=${configure.cc}
-}
+foreach ver ${gcc_versions} {
+ set ver_no_dot [join [split ${ver} "."] ""]
-variant gcc44 conflicts g95 gcc43 gcc45 gcc46 gcc47 universal description {link to libraries build with gfortran 4.4} {
- configure.compiler macports-gcc-4.4
- build.env-append F2CLIBS=gfortran \
- F2CLIBS_PREFIX=${prefix}/lib/gcc44 \
- CC=${configure.cc}
+ variant gcc${ver_no_dot} description {build with gfortran from gcc${ver_no_dot}} {}
+
+ variant gcc${ver_no_dot} conflicts g95 {}
+ variant g95 conflicts gcc${ver_no_dot} {}
+
+ foreach over ${gcc_versions} {
+ if {${ver} == ${over}} {
+ continue
+ }
+
+ set over_no_dot [join [split ${over} "."] ""]
+ variant gcc${ver_no_dot} conflicts gcc${over_no_dot} {}
+ }
+
+ if {[variant_isset gcc${ver_no_dot}]} {
+ if {${default_fortran_variant} != "+gcc${ver_no_dot}"} {
+ set default_fortran_variant ""
+ }
+ }
}
-variant gcc45 conflicts g95 gcc43 gcc44 gcc46 gcc47 universal description {link to libraries build with gfortran 4.5} {
- configure.compiler macports-gcc-4.5
- build.env-append F2CLIBS=gfortran \
- F2CLIBS_PREFIX=${prefix}/lib/gcc45 \
- CC=${configure.cc}
+variant g95 description {build with g95} {}
+
+if {[variant_isset g95]} {
+ if {${default_fortran_variant} != "+g95"} {
+ set default_fortran_variant ""
+ }
}
-variant gcc46 conflicts g95 gcc43 gcc44 gcc45 gcc47 universal description {link to libraries build with gfortran 4.6} {
- configure.compiler macports-gcc-4.6
- build.env-append F2CLIBS=gfortran \
- F2CLIBS_PREFIX=${prefix}/lib/gcc46 \
- CC=${configure.cc}
+if {${default_fortran_variant} != ""} {
+ default_variants-append "${default_fortran_variant}"
}
-variant gcc47 conflicts g95 gcc43 gcc44 gcc45 gcc46 universal description {link to libraries build with gfortran 4.7} {
- configure.compiler macports-gcc-4.7
- build.env-append F2CLIBS=gfortran \
- F2CLIBS_PREFIX=${prefix}/lib/gcc47 \
- CC=${configure.cc}
+foreach ver ${gcc_versions} {
+ set ver_no_dot [join [split ${ver} "."] ""]
+
+ if {[variant_isset gcc${ver_no_dot}]} {
+ depends_lib-append port:libgcc
+ depends_build-append port:gcc${ver_no_dot}
+
+ configure.fc ${prefix}/bin/gfortran-mp-${ver}
+ configure.f77 ${prefix}/bin/gfortran-mp-${ver}
+ configure.f90 ${prefix}/bin/gfortran-mp-${ver}
+
+ build.env-append F2CLIBS=gfortran \
+ F2CLIBS_PREFIX=${prefix}/lib/gcc${ver_no_dot} \
+ CC=${configure.cc}
+ }
}
-variant g95 conflicts gcc43 gcc44 gcc45 gcc46 gcc47 universal description {link to libraries build with g95} {
- depends_build-append port:g95
+if {[variant_isset g95]} {
+ depends_lib-append port:libgcc
+ depends_build-append port:g95
+
+ configure.fc ${prefix}/bin/g95
+ configure.f77 ${prefix}/bin/g95
+ configure.f90 ${prefix}/bin/g95
+
+ configure.fflags-append -fno-second-underscore
+
build.env-append F2CLIBS=f95 \
- F2CLIBS_PREFIX=${prefix}/lib \
+ F2CLIBS_PREFIX=${prefix}/lib/ \
CC=${configure.cc}
}
Modified: trunk/dports/python/py26-nio/Portfile
===================================================================
--- trunk/dports/python/py26-nio/Portfile 2013-08-26 08:15:41 UTC (rev 110106)
+++ trunk/dports/python/py26-nio/Portfile 2013-08-26 08:27:50 UTC (rev 110107)
@@ -38,7 +38,11 @@
reinplace "s|__init__(obj)|__init__()|" ${worksrcpath}/Nio.py
}
+# ncarg is not universal (and thus py26-nio is not universal)
+universal_variant no
+
depends_lib-append port:ncarg \
+ port:szip \
port:py26-numpy
build.env-append HAS_GRIB2=1 GRIB2_PREFIX=${prefix} \
@@ -47,49 +51,74 @@
NCARG_ROOT=${prefix}
destroot.env NCARG_ROOT=${prefix}
-if {![variant_isset g95] && ![variant_isset gcc43] && ![variant_isset gcc44] && ![variant_isset gcc45] && ![variant_isset gcc46] && ![variant_isset universal]} {
- default_variants +gcc47
-}
+set gcc_versions {4.3 4.4 4.5 4.6 4.7 4.8 4.9}
+set default_fortran_variant +gcc48
-variant gcc43 conflicts g95 gcc44 gcc45 gcc46 gcc47 universal description {link to libraries build with gfortran 4.3} {
- configure.compiler macports-gcc-4.3
- build.env-append F2CLIBS=gfortran \
- F2CLIBS_PREFIX=${prefix}/lib/gcc43 \
- CC=${configure.cc}
-}
+foreach ver ${gcc_versions} {
+ set ver_no_dot [join [split ${ver} "."] ""]
-variant gcc44 conflicts g95 gcc43 gcc45 gcc46 gcc47 universal description {link to libraries build with gfortran 4.4} {
- configure.compiler macports-gcc-4.4
- build.env-append F2CLIBS=gfortran \
- F2CLIBS_PREFIX=${prefix}/lib/gcc44 \
- CC=${configure.cc}
+ variant gcc${ver_no_dot} description {build with gfortran from gcc${ver_no_dot}} {}
+
+ variant gcc${ver_no_dot} conflicts g95 {}
+ variant g95 conflicts gcc${ver_no_dot} {}
+
+ foreach over ${gcc_versions} {
+ if {${ver} == ${over}} {
+ continue
+ }
+
+ set over_no_dot [join [split ${over} "."] ""]
+ variant gcc${ver_no_dot} conflicts gcc${over_no_dot} {}
+ }
+
+ if {[variant_isset gcc${ver_no_dot}]} {
+ if {${default_fortran_variant} != "+gcc${ver_no_dot}"} {
+ set default_fortran_variant ""
+ }
+ }
}
-variant gcc45 conflicts g95 gcc43 gcc44 gcc46 gcc47 universal description {link to libraries build with gfortran 4.5} {
- configure.compiler macports-gcc-4.5
- build.env-append F2CLIBS=gfortran \
- F2CLIBS_PREFIX=${prefix}/lib/gcc45 \
- CC=${configure.cc}
+variant g95 description {build with g95} {}
+
+if {[variant_isset g95]} {
+ if {${default_fortran_variant} != "+g95"} {
+ set default_fortran_variant ""
+ }
}
-variant gcc46 conflicts g95 gcc43 gcc44 gcc45 gcc47 universal description {link to libraries build with gfortran 4.6} {
- configure.compiler macports-gcc-4.6
- build.env-append F2CLIBS=gfortran \
- F2CLIBS_PREFIX=${prefix}/lib/gcc46 \
- CC=${configure.cc}
+if {${default_fortran_variant} != ""} {
+ default_variants-append "${default_fortran_variant}"
}
-variant gcc47 conflicts g95 gcc43 gcc44 gcc45 gcc46 universal description {link to libraries build with gfortran 4.7} {
- configure.compiler macports-gcc-4.7
- build.env-append F2CLIBS=gfortran \
- F2CLIBS_PREFIX=${prefix}/lib/gcc47 \
- CC=${configure.cc}
+foreach ver ${gcc_versions} {
+ set ver_no_dot [join [split ${ver} "."] ""]
+
+ if {[variant_isset gcc${ver_no_dot}]} {
+ depends_lib-append port:libgcc
+ depends_build-append port:gcc${ver_no_dot}
+
+ configure.fc ${prefix}/bin/gfortran-mp-${ver}
+ configure.f77 ${prefix}/bin/gfortran-mp-${ver}
+ configure.f90 ${prefix}/bin/gfortran-mp-${ver}
+
+ build.env-append F2CLIBS=gfortran \
+ F2CLIBS_PREFIX=${prefix}/lib/gcc${ver_no_dot} \
+ CC=${configure.cc}
+ }
}
-variant g95 conflicts gcc43 gcc44 gcc45 gcc46 gcc47 universal description {link to libraries build with g95} {
- depends_build-append port:g95
+if {[variant_isset g95]} {
+ depends_lib-append port:libgcc
+ depends_build-append port:g95
+
+ configure.fc ${prefix}/bin/g95
+ configure.f77 ${prefix}/bin/g95
+ configure.f90 ${prefix}/bin/g95
+
+ configure.fflags-append -fno-second-underscore
+
build.env-append F2CLIBS=f95 \
- F2CLIBS_PREFIX=${prefix}/lib \
+ F2CLIBS_PREFIX=${prefix}/lib/ \
CC=${configure.cc}
}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130826/9ece5066/attachment-0001.html>
More information about the macports-changes
mailing list