[130949] trunk/dports
sean at macports.org
sean at macports.org
Sat Jan 3 22:00:50 PST 2015
Revision: 130949
https://trac.macports.org/changeset/130949
Author: sean at macports.org
Date: 2015-01-03 22:00:49 -0800 (Sat, 03 Jan 2015)
Log Message:
-----------
compilers-1.0: set default fortran variant in the portgroup
Modified Paths:
--------------
trunk/dports/_resources/port1.0/group/compilers-1.0.tcl
trunk/dports/cad/freecad/Portfile
trunk/dports/devel/fortrancl/Portfile
trunk/dports/lang/julia/Portfile
trunk/dports/math/arpack/Portfile
trunk/dports/math/fftw/Portfile
trunk/dports/math/fgsl/Portfile
trunk/dports/math/ml/Portfile
trunk/dports/math/mumps/Portfile
trunk/dports/math/octave/Portfile
trunk/dports/math/qrupdate/Portfile
trunk/dports/science/berkeleygw/Portfile
trunk/dports/science/etsf_io/Portfile
trunk/dports/science/gildas/Portfile
trunk/dports/science/libxc/Portfile
trunk/dports/science/magicspp/Portfile
trunk/dports/science/netcdf-fortran/Portfile
trunk/dports/science/octopus/Portfile
trunk/dports/science/slatec/Portfile
trunk/dports/science/sparskit/Portfile
trunk/dports/science/wannier90/Portfile
Modified: trunk/dports/_resources/port1.0/group/compilers-1.0.tcl
===================================================================
--- trunk/dports/_resources/port1.0/group/compilers-1.0.tcl 2015-01-04 04:30:43 UTC (rev 130948)
+++ trunk/dports/_resources/port1.0/group/compilers-1.0.tcl 2015-01-04 06:00:49 UTC (rev 130949)
@@ -555,6 +555,14 @@
set compilers.variants [lsort [concat [remove_from_list $remove_list $duplicates] $add_list]]
eval compilers.setup_variants ${compilers.variants}
+ if {${compilers.require_fortran} && ![fortran_variant_isset]} {
+ if {[lsearch -exact ${compilers.variants} gfortran] > -1} {
+ default_variants-append +gfortran
+ } else {
+ default_variants-append +gcc48
+ }
+ }
+
set compilers.setup_done 1
}
}
Modified: trunk/dports/cad/freecad/Portfile
===================================================================
--- trunk/dports/cad/freecad/Portfile 2015-01-04 04:30:43 UTC (rev 130948)
+++ trunk/dports/cad/freecad/Portfile 2015-01-04 06:00:49 UTC (rev 130949)
@@ -62,10 +62,6 @@
compilers.choose fc
compilers.setup -dragonegg -g95 -gcc gcc48 require_fortran
-if {![fortran_variant_isset]} {
- default_variants-append +gcc48
-}
-
configure.args-delete -DCMAKE_INSTALL_RPATH=${prefix}/lib \
-DCMAKE_INSTALL_NAME_DIR=${prefix}/lib
Modified: trunk/dports/devel/fortrancl/Portfile
===================================================================
--- trunk/dports/devel/fortrancl/Portfile 2015-01-04 04:30:43 UTC (rev 130948)
+++ trunk/dports/devel/fortrancl/Portfile 2015-01-04 06:00:49 UTC (rev 130949)
@@ -45,9 +45,5 @@
${destroot}${prefix}/share/${name}/examples/
}
-if {![fortran_variant_isset]} {
- default_variants +gcc48
-}
-
# They differ when universal due to gcc multilib being messy non-universal
destroot.delete_la_files yes
Modified: trunk/dports/lang/julia/Portfile
===================================================================
--- trunk/dports/lang/julia/Portfile 2015-01-04 04:30:43 UTC (rev 130948)
+++ trunk/dports/lang/julia/Portfile 2015-01-04 06:00:49 UTC (rev 130949)
@@ -46,10 +46,6 @@
use_configure no
# use_parallel_build no
-if {![fortran_variant_isset]} {
- default_variants-append +gcc48
-}
-
post-extract {
file mkdir ${worksrcpath}/usr/lib
ln -s ${prefix}/lib/libfftw3.dylib ${worksrcpath}/usr/lib/
Modified: trunk/dports/math/arpack/Portfile
===================================================================
--- trunk/dports/math/arpack/Portfile 2015-01-04 04:30:43 UTC (rev 130948)
+++ trunk/dports/math/arpack/Portfile 2015-01-04 06:00:49 UTC (rev 130949)
@@ -27,10 +27,6 @@
configure.args home=${worksrcpath} --disable-mpi
-if {![fortran_variant_isset]} {
- default_variants +gfortran
-}
-
if {${build_arch} eq "x86_64" || ${build_arch} eq "ppc64"} {
configure.args-append FFLAGS='-O2 -m64'
} else {
Modified: trunk/dports/math/fftw/Portfile
===================================================================
--- trunk/dports/math/fftw/Portfile 2015-01-04 04:30:43 UTC (rev 130948)
+++ trunk/dports/math/fftw/Portfile 2015-01-04 06:00:49 UTC (rev 130949)
@@ -51,10 +51,6 @@
xinstall -m 644 ${worksrcpath}/fortran/fftw_f77.i ${destroot}${prefix}/include
}
-if {![fortran_variant_isset]} {
- default_variants +gfortran
-}
-
if {[mpi_variant_isset]} {
configure.args-append --enable-mpi
Modified: trunk/dports/math/fgsl/Portfile
===================================================================
--- trunk/dports/math/fgsl/Portfile 2015-01-04 04:30:43 UTC (rev 130948)
+++ trunk/dports/math/fgsl/Portfile 2015-01-04 06:00:49 UTC (rev 130949)
@@ -26,10 +26,6 @@
compilers.choose fc f77 f90
compilers.setup require_fortran
-if {![fortran_variant_isset]} {
- default_variants +gcc48
-}
-
destroot.args-append fgsl_exampledir=${prefix}/share/${name}/examples \
fgsl_docdir=${prefix}/share/doc/${name} \
fgsl_doc2dir=${prefix}/share/doc/${name}/html
Modified: trunk/dports/math/ml/Portfile
===================================================================
--- trunk/dports/math/ml/Portfile 2015-01-04 04:30:43 UTC (rev 130948)
+++ trunk/dports/math/ml/Portfile 2015-01-04 06:00:49 UTC (rev 130949)
@@ -47,10 +47,6 @@
system -W ${destroot}${prefix}/lib "ln -s lib${name}.${version}.dylib lib${name}.dylib"
}
-if {![fortran_variant_isset]} {
- default_variants +gfortran
-}
-
if {[mpi_variant_isset]} {
configure.args-append --enable-mpi
configure.cflags-append -DMPICH_SKIP_MPICXX -DOMPI_SKIP_MPICXX
Modified: trunk/dports/math/mumps/Portfile
===================================================================
--- trunk/dports/math/mumps/Portfile 2015-01-04 04:30:43 UTC (rev 130948)
+++ trunk/dports/math/mumps/Portfile 2015-01-04 06:00:49 UTC (rev 130949)
@@ -47,10 +47,6 @@
default_variants +mpich
}
-if {![fortran_variant_isset]} {
- default_variants +gfortran
-}
-
post-extract {
file copy ${worksrcpath}/Make.inc/Makefile.gfortran.PAR ${worksrcpath}/Makefile.inc
reinplace "s|^\#LMETISDIR.*$|LMETISDIR = ${prefix}/lib|" ${worksrcpath}/Makefile.inc
Modified: trunk/dports/math/octave/Portfile
===================================================================
--- trunk/dports/math/octave/Portfile 2015-01-04 04:30:43 UTC (rev 130948)
+++ trunk/dports/math/octave/Portfile 2015-01-04 06:00:49 UTC (rev 130949)
@@ -133,10 +133,6 @@
}
}
-if {![fortran_variant_isset]} {
- default_variants-append +gcc48
-}
-
# atlas does not work with g95, so always conflict with it
variant atlas description {use BLAS from MacPorts' atlas port} \
Modified: trunk/dports/math/qrupdate/Portfile
===================================================================
--- trunk/dports/math/qrupdate/Portfile 2015-01-04 04:30:43 UTC (rev 130948)
+++ trunk/dports/math/qrupdate/Portfile 2015-01-04 06:00:49 UTC (rev 130949)
@@ -93,6 +93,3 @@
reinplace "s|gfortran|${configure.fc}|" ${worksrcpath}/Makeconf
}
}
-if {![fortran_variant_isset]} {
- default_variants-append +gcc48
-}
Modified: trunk/dports/science/berkeleygw/Portfile
===================================================================
--- trunk/dports/science/berkeleygw/Portfile 2015-01-04 04:30:43 UTC (rev 130948)
+++ trunk/dports/science/berkeleygw/Portfile 2015-01-04 06:00:49 UTC (rev 130949)
@@ -31,10 +31,6 @@
compilers.choose fc cpp
mpi.setup require_fortran -dragonegg -openmpi -openmpi_devel
-if {![fortran_variant_isset]} {
- default_variants-append +gcc48
-}
-
if {[mpi_variant_isset]} {
depends_lib-append port:scalapack
}
Modified: trunk/dports/science/etsf_io/Portfile
===================================================================
--- trunk/dports/science/etsf_io/Portfile 2015-01-04 04:30:43 UTC (rev 130948)
+++ trunk/dports/science/etsf_io/Portfile 2015-01-04 06:00:49 UTC (rev 130949)
@@ -23,10 +23,6 @@
compilers.choose fc
compilers.setup require_fortran
-if {![fortran_variant_isset]} {
- default_variants-append +gcc48
-}
-
depends_lib port:netcdf-fortran
# https://trac.macports.org/ticket/39319
Modified: trunk/dports/science/gildas/Portfile
===================================================================
--- trunk/dports/science/gildas/Portfile 2015-01-04 04:30:43 UTC (rev 130948)
+++ trunk/dports/science/gildas/Portfile 2015-01-04 06:00:49 UTC (rev 130949)
@@ -55,10 +55,6 @@
compilers.setup -g95 -gcc44 -gcc45 -gcc46 require_fortran
configure.python ${prefix}/bin/python2.7
-if {![fortran_variant_isset]} {
- default_variants-append +gcc49
-}
-
post-extract {
if {![gcc_variant_isset]} {
reinplace -W ${worksrcpath}/admin "s|-Wrealloc-lhs-all||" define-system.sh
Modified: trunk/dports/science/libxc/Portfile
===================================================================
--- trunk/dports/science/libxc/Portfile 2015-01-04 04:30:43 UTC (rev 130948)
+++ trunk/dports/science/libxc/Portfile 2015-01-04 06:00:49 UTC (rev 130949)
@@ -28,10 +28,6 @@
compilers.choose fc
compilers.setup require_fortran
-if {![fortran_variant_isset]} {
- default_variants-append +gcc48
-}
-
use_parallel_build yes
universal_variant no
Modified: trunk/dports/science/magicspp/Portfile
===================================================================
--- trunk/dports/science/magicspp/Portfile 2015-01-04 04:30:43 UTC (rev 130948)
+++ trunk/dports/science/magicspp/Portfile 2015-01-04 06:00:49 UTC (rev 130949)
@@ -57,9 +57,6 @@
use_parallel_build no
universal_variant no
-if {![fortran_variant_isset]} {
- default_variants-append +gcc48
-}
default_variants-append +python27
use_configure yes
Modified: trunk/dports/science/netcdf-fortran/Portfile
===================================================================
--- trunk/dports/science/netcdf-fortran/Portfile 2015-01-04 04:30:43 UTC (rev 130948)
+++ trunk/dports/science/netcdf-fortran/Portfile 2015-01-04 06:00:49 UTC (rev 130949)
@@ -87,7 +87,3 @@
destroot.destdir prefix=${destroot}${prefix} \
MANDIR=\\\${prefix}/share/man
-
-if {![fortran_variant_isset]} {
- default_variants-append +gcc48
-}
Modified: trunk/dports/science/octopus/Portfile
===================================================================
--- trunk/dports/science/octopus/Portfile 2015-01-04 04:30:43 UTC (rev 130948)
+++ trunk/dports/science/octopus/Portfile 2015-01-04 06:00:49 UTC (rev 130949)
@@ -40,10 +40,8 @@
configure.optflags -O3
default_variants +newuoa
-# FIXME: does this not happen in time to make fftw-3 get installed +gcc48?
-if {![fortran_variant_isset]} {
- default_variants +gcc48
-}
+# FIXME: does fortran default variant not happen in time to make fftw-3 get
+# installed +gcc48?
# Update test results for libxc 2.1.0 (distribution has results for libxc 2.0.0)
patchfiles patch-testsuite-periodic_systems-07-tb09.test.diff \
Modified: trunk/dports/science/slatec/Portfile
===================================================================
--- trunk/dports/science/slatec/Portfile 2015-01-04 04:30:43 UTC (rev 130948)
+++ trunk/dports/science/slatec/Portfile 2015-01-04 06:00:49 UTC (rev 130949)
@@ -31,10 +31,6 @@
compilers.choose fc f77 f90
compilers.setup require_fortran
-
-if {![fortran_variant_isset]} {
- default_variants-append +gcc48
-}
post-fetch {
build.args-append FC=${configure.fc}
Modified: trunk/dports/science/sparskit/Portfile
===================================================================
--- trunk/dports/science/sparskit/Portfile 2015-01-04 04:30:43 UTC (rev 130948)
+++ trunk/dports/science/sparskit/Portfile 2015-01-04 06:00:49 UTC (rev 130949)
@@ -44,10 +44,6 @@
test.args FFLAGS=-O3
# test requires FC, FFLAGS set because test makefiles lack explicit rule for .f -> .o and these are in the implicit rule
-if {![fortran_variant_isset]} {
- default_variants-append +gcc48
-}
-
post-fetch {
build.args-append F77=${configure.fc}
test.args-append F77=${configure.fc} FC=${configure.fc}
Modified: trunk/dports/science/wannier90/Portfile
===================================================================
--- trunk/dports/science/wannier90/Portfile 2015-01-04 04:30:43 UTC (rev 130948)
+++ trunk/dports/science/wannier90/Portfile 2015-01-04 06:00:49 UTC (rev 130949)
@@ -59,10 +59,6 @@
compilers.choose f90
compilers.setup require_fortran
-if {![fortran_variant_isset]} {
- default_variants-append +gcc48
-}
-
variant threads description {Build with threaded ATLAS} {}
test.run yes
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150103/18aa60ac/attachment-0001.html>
More information about the macports-changes
mailing list