bulk update: remove dragonegg and llvm from mpi or compilers setup

This should have gone into the commit that removed the variants from the port groups, so that's a mistake on my part.
macports · Mar 26, 2018 · 907a4a8 · 907a4a8
1 parent c024c08
commit 907a4a8
Show file tree

Hide file tree

Showing 46 changed files with 47 additions and 55 deletions.
diff --git a/cad/freecad/Portfile b/cad/freecad/Portfile
@@ -61,7 +61,7 @@ post-patch {
 }
 
 compilers.choose        fc
-compilers.setup         -dragonegg -g95 require_fortran
+compilers.setup         require_fortran -g95
 
 cmake.install_prefix    ${prefix}/libexec/${name}
 cmake.install_rpath     ${cmake.install_prefix}/lib

diff --git a/devel/GASNet/Portfile b/devel/GASNet/Portfile
@@ -4,7 +4,7 @@ PortSystem          1.0
 
 PortGroup           mpi 1.0
 compilers.choose    cc cxx
-mpi.setup           require -clang -dragonegg -g95 -gfortran -llvm
+mpi.setup           require -clang -g95 -gfortran -llvm
 
 PortGroup           compiler_blacklist_versions 1.0
 compiler.blacklist  {clang < 421} *llvm-gcc-4.2 *gcc-4.0 gcc-3.3

diff --git a/devel/boost/Portfile b/devel/boost/Portfile
@@ -89,7 +89,7 @@ proc write_jam s {
 compiler.blacklist {clang < 421} *llvm-gcc-4.2 *gcc-4.0 gcc-3.3
 
 compilers.choose   cc cxx
-mpi.setup          -gcc -dragonegg
+mpi.setup          -gcc
 
 # NOTE: although technically Boost does not require C++11 compliance
 # for building, doing so allows for building on more OSs than without.

diff --git a/devel/fortrancl/Portfile b/devel/fortrancl/Portfile
@@ -5,7 +5,7 @@ PortGroup           muniversal 1.0
 PortGroup           compilers 1.0
 
 compilers.choose    fc f77 f90
-compilers.setup     require_fortran -dragonegg
+compilers.setup     require_fortran
 
 name                fortrancl
 version             0.1alpha4

diff --git a/devel/qd/Portfile b/devel/qd/Portfile
@@ -25,7 +25,7 @@ homepage        http://crd.lbl.gov/~dhbailey/mpdist/
 master_sites    ${homepage}
 
 compilers.choose    cxx fc
-compilers.setup     -dragonegg -gfortran
+compilers.setup     -gfortran
 
 checksums \
         md5     5e17dbeaff328ce312ccadccdb669592 \

diff --git a/lang/omnicompiler/Portfile b/lang/omnicompiler/Portfile
@@ -32,7 +32,7 @@ checksums           rmd160  5a0fe2b1f74c8692a13665e7d00a2ef770b3f96c \
 use_bzip2           yes
 
 compilers.choose    cc fc
-mpi.setup           require -clang -dragonegg -g95 -gfortran -llvm
+mpi.setup           require -clang -g95 -gfortran
 if {[variant_isset coarray]} {
     mpi.enforce_variant GASNet
 }

diff --git a/math/fgsl/Portfile b/math/fgsl/Portfile
@@ -23,7 +23,7 @@ use_parallel_build  no
 universal_variant   no
 
 compilers.choose    fc f77 f90
-compilers.setup     require_fortran -dragonegg -g95
+compilers.setup     require_fortran -g95
 
 use_autoreconf      yes
 

diff --git a/math/gnudatalanguage/Portfile b/math/gnudatalanguage/Portfile
@@ -11,7 +11,7 @@ epoch                       2
 revision                    1
 
 compilers.choose            cc cxx
-mpi.setup                   -dragonegg
+mpi.setup
 
 categories                  math science
 maintainers                 takeshi

diff --git a/math/gsl/Portfile b/math/gsl/Portfile
@@ -36,7 +36,7 @@ post-activate    {
 }
 
 compilers.choose    cc
-compilers.setup     -dragonegg
+compilers.setup
 
 if {[variant_isset doc_python27]} { set PythonVersion 27 }
 if {[variant_isset doc_python35]} { set PythonVersion 35 }

diff --git a/math/lapack/Portfile b/math/lapack/Portfile
@@ -23,7 +23,7 @@ checksums           rmd160  ff306181c4c125e7594c57c1eeece8b0aa8f8523 \
                     sha256  deb22cc4a6120bff72621155a9917f485f96ef8319ac074a7afbc68aab88bcf6
 
 compilers.choose    cc fc f77 f90
-compilers.setup     require_fortran -clang -llvm -dragonegg
+compilers.setup     require_fortran -clang
 
 cmake.out_of_source yes
 

diff --git a/math/mlpack/Portfile b/math/mlpack/Portfile
@@ -5,7 +5,7 @@ PortGroup           cmake 1.0
 PortGroup           compilers 1.0
 
 compilers.choose    cc cxx
-compilers.setup     -dragonegg -llvm -gcc
+compilers.setup     -gcc
 
 name                mlpack
 version             2.2.5

diff --git a/math/octave-control/Portfile b/math/octave-control/Portfile
@@ -18,6 +18,6 @@ checksums           rmd160 e2c88548d09e1e7b2a69cda4fea6b10358a0eeef \
 		            sha256 741dcfafc85b280e9ebbd2ea160b8ffa224fa840d801f64676403d4c5aefe57b
 
 compilers.choose    fc f77 f90
-compilers.setup     require_fortran -dragonegg
+compilers.setup     require_fortran
 
 patchfiles          patch-src-Makefile.diff
diff --git a/math/octave-ltfat/Portfile b/math/octave-ltfat/Portfile
@@ -22,4 +22,4 @@ long_description    ${description} (LTFAT) is a Matlab/Octave toolbox for workin
                     (filter prototypes) and routines for manipulating coefficients.
 
 compilers.choose    fc f77 f90
-compilers.setup     require_fortran -dragonegg
+compilers.setup     require_fortran
diff --git a/math/octave-optim/Portfile b/math/octave-optim/Portfile
@@ -19,4 +19,4 @@ depends_lib-append  port:octave-miscellaneous \
                     port:octave-struct
 
 compilers.choose    fc f77 f90
-compilers.setup     require_fortran -dragonegg
+compilers.setup     require_fortran
diff --git a/math/octave-tisean/Portfile b/math/octave-tisean/Portfile
@@ -20,6 +20,6 @@ checksums           rmd160 88d9562a685e0d00ea48f068d161b1022f7126c2 \
 patchfiles-append   patch-flib.diff
 
 compilers.choose    fc f77 f90
-compilers.setup     require_fortran -dragonegg
+compilers.setup     require_fortran
 
 depends_lib-append  port:octave-signal
diff --git a/math/octave-tsa/Portfile b/math/octave-tsa/Portfile
@@ -19,4 +19,4 @@ checksums           rmd160 75267e3df5f2667f20bb3243cc2687565fa70e13 \
 configure.env-append "PREFIX_BIN=${prefix}/bin"
 
 compilers.choose    fc f77 f90
-compilers.setup     require_fortran -dragonegg
+compilers.setup     require_fortran
diff --git a/math/octave/Portfile b/math/octave/Portfile
@@ -202,7 +202,6 @@ compilers.clear_archflags no
 # some of these compilers may work fine
 compilers.setup     \
     require_fortran \
-    -dragonegg      \
     -gcc5           \
     -gcc49          \
     -gcc48          \
@@ -211,7 +210,6 @@ compilers.setup     \
     -gcc45          \
     -gcc44          \
     -g95            \
-    -llvm           \
     -clang36        \
     -clang35        \
     -clang34        \

diff --git a/math/qrupdate/Portfile b/math/qrupdate/Portfile
@@ -6,7 +6,7 @@ PortGroup           compilers 1.0
 PortGroup           linear_algebra 1.0
 
 compilers.choose    fc
-compilers.setup     require_fortran -dragonegg
+compilers.setup     require_fortran
 
 name                qrupdate
 version             1.1.2

diff --git a/python/py-ngl/Portfile b/python/py-ngl/Portfile
@@ -51,7 +51,7 @@ if {${name} ne ${subport}} {
     destroot.env        NCARG_ROOT=${prefix}
 
     compilers.choose    fc f77 f90
-    compilers.setup     require_fortran -dragonegg
+    compilers.setup     require_fortran
 
     if {[gcc_variant_isset]} {
         build.env-append    F2CLIBS=gfortran \

diff --git a/python/py-nio/Portfile b/python/py-nio/Portfile
@@ -53,7 +53,7 @@ if {${name} ne ${subport}} {
     destroot.env        NCARG_ROOT=${prefix}
 
     compilers.choose    fc f77 f90
-    compilers.setup     require_fortran -dragonegg
+    compilers.setup     require_fortran
 
     if {[gcc_variant_isset]} {
         build.env-append    F2CLIBS=gfortran \

diff --git a/python/py-numpy/Portfile b/python/py-numpy/Portfile
@@ -53,7 +53,7 @@ if {${name} ne ${subport}} {
                             patch-numpy_tests_test_scripts.py.diff \
                             patch-fcompiler_g95.diff
     }
-    compilers.setup         require_fortran -clang -dragonegg -gcc44 -gcc45 \
+    compilers.setup         require_fortran -clang -gcc44 -gcc45 \
                             -gcc46 -gcc47 -gcc48 -g95 clang37
 
     patchfiles-append       patch-f2py_setup.py.diff

diff --git a/python/py-pymc/Portfile b/python/py-pymc/Portfile
@@ -30,7 +30,7 @@ if {${name} ne ${subport}} {
                     sha256  9c33a3430e8d55dbe0beaa79394e866f9115c4ec84615e24dabc154334538a6a
 
     compilers.choose   fc f77 f90
-    compilers.setup    require_fortran -dragonegg
+    compilers.setup    require_fortran
 
     if {[gcc_variant_isset]} {
         build.cmd "${build.cmd} config_fc --fcompiler gfortran"

diff --git a/python/py-scipy/Portfile b/python/py-scipy/Portfile
@@ -24,7 +24,7 @@ python.versions         26 27 33 34 35 36
 python.add_archflags    no
 universal_variant       no
 
-compilers.setup         require_fortran -clang -dragonegg -gcc44 -gcc45 -gcc46 \
+compilers.setup         require_fortran -clang -gcc44 -gcc45 -gcc46 \
                         -gcc47 -gcc48 -g95 clang37
 
 if {${name} ne ${subport}} {

diff --git a/python/py-usadel1/Portfile b/python/py-usadel1/Portfile
@@ -36,7 +36,7 @@ if {${name} ne ${subport}} {
     universal_variant no
 
     compilers.choose    fc f77 f90
-    compilers.setup     require_fortran -dragonegg -g95
+    compilers.setup     require_fortran -g95
 
     # probably a different --fcompiler is needed for dragonegg or g95
     build.args          config_fc \

diff --git a/science/ALPSCore/Portfile b/science/ALPSCore/Portfile
@@ -28,7 +28,7 @@ depends_lib         port:boost \
                     port:hdf5
 
 compilers.choose    cc cxx
-mpi.setup           -gcc -dragonegg
+mpi.setup           -gcc
 
 configure.args      -DTesting=ON \
                     -DExtensiveTesting=OFF \

diff --git a/science/Gyoto/Portfile b/science/Gyoto/Portfile
@@ -53,7 +53,7 @@ build.args-append   Y_CFLAGS="${configure.cxxflags}" Y_CPPFLAGS="${configure.cpp
 test.target         check check-lorene
 test.run            yes
 
-compilers.setup     -gcc -dragonegg
+compilers.setup     -gcc
 compilers.enforce_c lorene
 
 if {![catch {set result [active_variants boost openmpi {}]}]} {

diff --git a/science/OpenCoarrays/Portfile b/science/OpenCoarrays/Portfile
@@ -26,7 +26,7 @@ homepage            http://opencoarrays.org
 
 mpi.setup           require require_fortran \
                     -gcc44 -gcc45 -gcc46 -gcc47 -gcc48 -gcc49 -gcc5 \
-                    -dragonegg -clang -llvm -fortran
+                    -clang -fortran
 universal_variant   no
 
 checksums           rmd160  fc31bb79550f46c1b6eb48c39193fd59f0c1d68c \

diff --git a/science/berkeleygw/Portfile b/science/berkeleygw/Portfile
@@ -43,14 +43,9 @@ if {![variant_isset fftw2]} {
 # WHAT DO WE DO WHEN meaning of 'gfortran' is updated? No record... Maybe rename to gfortran5 etc. ?
 
 # test hangs in Epsilon with OpenMPI, for unknown reason.
-# dragonegg fails to link with error
-#   Undefined symbols for architecture x86_64:
-#   "_llvm.objectsize.i64", referenced from:
-#   _spg_get_international in libsymspg.a(spglib.o)
-#   _spg_get_schoenflies in libsymspg.a(spglib.o)
 compilers.choose    fc cc cxx cpp
 # can we re-enable OpenMPI?
-mpi.setup           require_fortran -dragonegg -openmpi -openmpi_devel -gfortran -clang -llvm
+mpi.setup           require_fortran -openmpi -openmpi_devel -gfortran -clang
 # FIXME: +gfortran just needs smarter setting of cpp to the one from gcc;
 #clang and llvm only useful with +g95 currently (which is useless)
 

diff --git a/science/ccpnmr/Portfile b/science/ccpnmr/Portfile
@@ -28,7 +28,7 @@ patchfiles          ccpnmr.patch
 use_configure       no
 
 compilers.choose    cc cxx
-compilers.setup     -clang -dragonegg -g95 -gfortran -llvm
+compilers.setup     -clang -g95 -gfortran
 
 set python.branch	2.7
 set python.prefix	${frameworks_dir}/Python.framework/Versions/${python.branch}

diff --git a/science/cdo/Portfile b/science/cdo/Portfile
@@ -26,7 +26,7 @@ long_description \
 fetch.ignore_sslcert        yes
 
 compilers.choose            cc cxx
-mpi.setup                   -dragonegg
+mpi.setup
 mpi.enforce_variant         hdf5
 
 depends_lib                 port:netcdf \

diff --git a/science/cfitsio/Portfile b/science/cfitsio/Portfile
@@ -34,7 +34,7 @@ checksums           rmd160  5a99607ec1ac01286d8e36d9d9f01ce35622f07b \
 patchfiles          patch-configure.diff patch-Makefile.in.diff
 
 compilers.choose    fc
-compilers.setup     -dragonegg
+compilers.setup
 
 # turn off FORTRAN compiler wrappers by removing FORTRAN from the path
 if {![fortran_variant_isset]} {

diff --git a/science/ecCodes/Portfile b/science/ecCodes/Portfile
@@ -26,7 +26,7 @@ long_description \
 if [fortran_variant_isset] {
     compilers.choose    fc f77 f90
 }
-compilers.setup     -clang -dragonegg -gfortran -llvm -gcc44 -gcc45 -gcc46
+compilers.setup     -clang -gfortran -gcc44 -gcc45 -gcc46
 
 depends_build-append \
                     bin:bison:bison \

diff --git a/science/eo/Portfile b/science/eo/Portfile
@@ -47,7 +47,7 @@ configure.args-append   -DENABLE_CMAKE_TESTING:BOOL=ON
 test.run                yes
 
 compilers.choose        cc cxx
-compilers.setup         -gcc44 -gcc45 -gcc46 -dragonegg
+compilers.setup         -gcc44 -gcc45 -gcc46
 
 #gcc44 gcc45 gcc46 dragonegg: cc1: error: unrecognized command line option "-arch"
 

diff --git a/science/esmf/Portfile b/science/esmf/Portfile
@@ -5,7 +5,7 @@ PortGroup           mpi 1.0
 PortGroup           active_variants 1.1
 
 compilers.choose    f90 cxx
-compilers.setup     require_fortran -dragonegg -clang -llvm
+compilers.setup     require_fortran -clang
 mpi.setup
 mpi.enforce_variant netcdf-fortran
 

diff --git a/science/giza/Portfile b/science/giza/Portfile
@@ -30,7 +30,7 @@ depends_build       port:pkgconfig
 depends_lib         path:lib/pkgconfig/cairo.pc:cairo \
                     port:xorg-libX11
 
-compilers.setup     require_fortran -dragonegg -g95
+compilers.setup     require_fortran -g95
 
 configure.args      --disable-silent-rules
 

diff --git a/science/hdfeos5/Portfile b/science/hdfeos5/Portfile
@@ -28,7 +28,7 @@ checksums           md5     5d607a13dd42e559bfc90e278a8ec919 \
                     rmd160  34df5cdb6bdc4d06a7658d38aae6fed0b5671557
 
 compilers.choose    cc cxx
-mpi.setup           -clang -dragonegg -llvm
+mpi.setup           -clang
 compilers.enforce_c hdf5
 
 depends_build       port:libtool

diff --git a/science/libemos/Portfile b/science/libemos/Portfile
@@ -22,7 +22,7 @@ long_description \
     and BUFR & CREX encoding/decoding routines.
 
 compilers.choose    fc f77 f90
-compilers.setup     -clang -dragonegg -g95 -llvm
+compilers.setup     -clang -g95
 cmake.out_of_source yes
 
 patchfiles          patch-libemos-dp-CMakeLists.txt.diff \

diff --git a/science/ncarg/Portfile b/science/ncarg/Portfile
@@ -6,7 +6,7 @@ PortGroup                   conflicts_build 1.0
 PortGroup                   compilers 1.0
 
 compilers.choose            fc f77 f90
-compilers.setup             -clang -dragonegg -gfortran -llvm
+compilers.setup             -clang -gfortran
 
 name                        ncarg
 version                     6.4.0

diff --git a/science/nco/Portfile b/science/nco/Portfile
@@ -13,7 +13,7 @@ categories          science
 description         The netCDF Operators
 
 compilers.choose    cc cxx
-compilers.setup     -clang -dragonegg -llvm
+compilers.setup     -clang
 
 checksums           rmd160  9cd3324bb5078c0ba4f82144411382c938d90bb0 \
                     sha256  d12f525d93bb116818f1a63fbb7c7ef84dc15307c1c96c2fdcf9bd826ac6d78a

diff --git a/science/octopus/Portfile b/science/octopus/Portfile
@@ -28,8 +28,7 @@ checksums           rmd160  695a22404ab2ce0efbd5555be1077f61ff0d430c \
 compiler.blacklist  macports-clang-3.8
 
 # clang versions are unnecessary
-# dragonegg34-gcc46 segfaults on varia.c
-mpi.setup           require_fortran -dragonegg34 -clang
+mpi.setup           require_fortran -clang
 
 # this incorrectly passes if libxc +gcc5, octopus +mpich, mpich-default +gcc49
 compilers.enforce_fortran libxc

diff --git a/science/paraview/Portfile b/science/paraview/Portfile
@@ -78,9 +78,9 @@ pre-configure {
 #    DPARAVIEW_DO_UNIX_STYLE_INSTALLS:BOOL=ON
 #configure.cxxflags-append 	        -DUSE_INTERP_ERRORLINE
 
-# Some cmake tests will fail with "error: unrecognized option '-arch'" from gcc 4.6 and earlier. Same with dragonegg based on it.
+# Some cmake tests will fail with "error: unrecognized option '-arch'" from gcc 4.6 and earlier.
 compilers.choose    fc
-mpi.setup           default -dragonegg -gcc44 -gcc45 -gcc46
+mpi.setup           default -gcc44 -gcc45 -gcc46
 
 # no compilers.choose cc cxx because:
 # gcc6,7 C compiler fails with:

diff --git a/science/plplot/Portfile b/science/plplot/Portfile
@@ -26,7 +26,7 @@ plotting contexts."
 long_description    ${description_base} This port uses double precision.
 
 compilers.choose    fc f90
-compilers.setup     -dragonegg
+compilers.setup
 
 depends_build-append \
                 port:pkgconfig

diff --git a/science/plplot510/Portfile b/science/plplot510/Portfile
@@ -28,7 +28,7 @@ dist_subdir     plplot
 long_description    ${description_base} This port uses double precision.
 
 compilers.choose    fc f90
-compilers.setup     -dragonegg
+compilers.setup
 
 depends_build-append \
                 port:pkgconfig