Revision
149145
Author
mmoll@macports.org
Date
2016-06-01 16:39:34 -0700 (Wed, 01 Jun 2016)

Log Message

math/qhull: simplify compiler selection. see #51544.

Modified Paths

Diff

Modified: trunk/dports/math/qhull/Portfile (149144 => 149145)


--- trunk/dports/math/qhull/Portfile	2016-06-01 20:08:28 UTC (rev 149144)
+++ trunk/dports/math/qhull/Portfile	2016-06-01 23:39:34 UTC (rev 149145)
@@ -4,6 +4,7 @@
 PortSystem 1.0
 PortGroup           cmake 1.0
 PortGroup  compiler_blacklist_versions 1.0
+PortGroup           compilers 1.0
 cmake.out_of_source yes
 
 name                qhull
@@ -48,22 +49,11 @@
 # qhull requires compiler with -Wno-sign-conversion
 # 10.6 doesn't have it by default
 platform darwin 10 {
-    variant gcc47 description {build qhull with gcc47} {
-        depends_build-append  port:gcc47
-        configure.args-append -DCMAKE_C_COMPILER=${prefix}/bin/gcc-mp-4.7 \
-        -DCMAKE_CXX_COMPILER=${prefix}/bin/g++-mp-4.7
+    compilers.choose      cc cxx
+    compilers.setup
+    if {![c_variant_isset]} {
+        default_variants-append  +${compilers.gcc_default}
     }
-    variant gcc48 description {build qhull with gcc48} {
-        depends_build-append  port:gcc48
-        configure.args-append -DCMAKE_C_COMPILER=${prefix}/bin/gcc-mp-4.8 \
-        -DCMAKE_CXX_COMPILER=${prefix}/bin/g++-mp-4.8
-    }
-    variant gcc5 description {build qhull with gcc5} {
-        depends_build-append  port:gcc5
-        configure.args-append -DCMAKE_C_COMPILER=${prefix}/bin/gcc-mp-5 \
-        -DCMAKE_CXX_COMPILER=${prefix}/bin/g++-mp-5
-    }
-    default_variants          +gcc5
 }
 
 configure.args-append   -DDOC_INSTALL_DIR=share/doc/qhull -DMAN_INSTALL_DIR=share/man/man1
@@ -76,3 +66,5 @@
 livecheck.type      regex
 livecheck.url       ${master_sites}
 livecheck.regex     Download: Qhull (\[0-9.\]+) for Unix
+
+test.run  yes