[143373] trunk/dports/science/xrmc/Portfile

[dstrubbe at macports.org]

Revision: 143373
          https://trac.macports.org/changeset/143373
Author:   dstrubbe at macports.org
Date:     2015-12-11 08:54:16 -0800 (Fri, 11 Dec 2015)
Log Message:
-----------
xrmc: Offer variant so OpenMP can be disabled. Blacklist gcc-4.2 which caused build failure on Snow Leopard buildbot. Allow everything else in compilers.setup since a lot of variants fail test but not build, possibly not reproducibly...

Modified Paths:
--------------
    trunk/dports/science/xrmc/Portfile

Modified: trunk/dports/science/xrmc/Portfile
===================================================================
--- trunk/dports/science/xrmc/Portfile	2015-12-11 16:43:49 UTC (rev 143372)
+++ trunk/dports/science/xrmc/Portfile	2015-12-11 16:54:16 UTC (rev 143373)
@@ -33,17 +33,30 @@
 
 depends_lib         port:xraylib
 
-configure.args      --disable-xmi-msim
+configure.args      --disable-xmi-msim --disable-openmp
 
 test.run            yes
 test.target         check
 # FIXME: 'check' rather than 'test' should be default always...
 
-# gcc6,gcc5,gcc49,clang38,clang37,clang36,clang34 fail test cylind_shell. llvm,dragonegg33,dragonegg34 are ok. So, be careful with variants!
+# gcc,clang38,clang37,clang36,clang34 fail test cylind_shell. llvm,dragonegg33,dragonegg34 are ok. So, be careful with variants!
 # It is good to offer them since the default clang on Yosemite works but default on other OSX versions might not.
 compilers.choose    cc cxx
-compilers.setup     -gcc49 -gcc5 -gcc6 -clang
+compilers.setup     
+compiler.blacklist  gcc-4.2
+# COLLAPSE is a new clause that has been added in OpenMP 3.0, which is supported only in GCC 4.4 and later
+# so gcc 4.2 will give errors like this:
+# detector.cpp:187: error: expected '#pragma omp' clause before 'collapse'
+# detector.cpp:279: error: expected '#pragma omp' clause before 'collapse'
+# llvm-gcc-4.2 is fine though because the configure script correctly detects that OpenMP is not supported; same for default clang
 
+variant openmp description {Build with OpenMP. Might cause trouble for some compilers.} {
+    configure.args-delete  --disable-openmp
+    configure.args-append  --enable-openmp
+}
+
+default_variants-append +openmp
+
 livecheck.type      regex
 livecheck.url       [lindex ${master_sites} 0]
 livecheck.regex     ${name}-(\[0-9.\]+)${extract.suffix}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20151212/baaa8b8e/attachment.html>