[144829] trunk/dports/science/berkeleygw/Portfile

[dstrubbe at macports.org]

Revision: 144829
          https://trac.macports.org/changeset/144829
Author:   dstrubbe at macports.org
Date:     2016-01-19 10:44:59 -0800 (Tue, 19 Jan 2016)
Log Message:
-----------
berkeleygw: Only use llvm-gcc42 for cpp not for C/C++, and make sure it is only a build dependency and only when needed because gcc4.x cpp is not being used. Enable gcc5, gcc6, gfortran variants.

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

Modified: trunk/dports/science/berkeleygw/Portfile
===================================================================
--- trunk/dports/science/berkeleygw/Portfile	2016-01-19 18:00:52 UTC (rev 144828)
+++ trunk/dports/science/berkeleygw/Portfile	2016-01-19 18:44:59 UTC (rev 144829)
@@ -30,9 +30,6 @@
 
 # WHAT DO WE DO WHEN meaning of 'gfortran' is updated? No record... Must rename to gfortran5 etc.
 
-# fine for C and C++, but not for cpp on Fortran here
-compiler.blacklist  *clang*
-
 # test hangs in Epsilon with OpenMPI, for unknown reason.
 # no appropriate way to set cpp for gcc5, gcc6, or clang
 # dragonegg fails to link with error
@@ -41,12 +38,12 @@
 #   _spg_get_international in libsymspg.a(spglib.o)
 #   _spg_get_schoenflies in libsymspg.a(spglib.o)
 compilers.choose    fc cc cxx cpp
-mpi.setup           require_fortran -dragonegg -openmpi -openmpi_devel -gcc5 -gcc6
+mpi.setup           require_fortran -dragonegg -openmpi -openmpi_devel
 
-# we only use llvm (if at all) for cpp. it should not be a lib dependency. not sure how exactly to do this generally...
-#depends_lib-delete  port:llvm-gcc42
-#depends_build-append  port:llvm-gcc42
-# should only get used in conjunction with +g95 anyway
+# just for cpp
+if {[variant_isset g95] || [variant_isset gcc5] || [variant_isset gcc6] || [variant_isset gfortran]} {
+    depends_build-append  port:llvm-gcc42
+}
 
 if {[mpi_variant_isset]} {
     depends_lib-append  port:scalapack
@@ -114,7 +111,10 @@
         build.args-append  FFTWLIB="-L${prefix}/lib/ -ldfftw"
     }
 
-    # +g95 must be working in conjunction with +llvm
+    if {[variant_isset g95] || [variant_isset gcc5] || [variant_isset gcc6] || [variant_isset gfortran]} {
+        set configure.cpp     llvm-cpp-4.2
+    }
+
     if {[variant_isset g95]} {
         build.args-append COMPFLAG="-DG95" FCPP="${configure.cpp} -P -ansi" \
                           F90free="${prefix}/bin/g95 -ffree-form -ffree-line-length-huge -fno-second-underscore" \
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160119/4403dfca/attachment.html>