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

[dstrubbe at macports.org]

Revision: 146915
          https://trac.macports.org/changeset/146915
Author:   dstrubbe at macports.org
Date:     2016-03-20 13:06:37 -0700 (Sun, 20 Mar 2016)
Log Message:
-----------
berkeleygw: Fix for vecLibFort with case-sensitive filesystems. Consolidate two if-conditions. Comments on problem with latest mpich-gcc5.

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

Modified: trunk/dports/science/berkeleygw/Portfile
===================================================================
--- trunk/dports/science/berkeleygw/Portfile	2016-03-20 19:22:03 UTC (rev 146914)
+++ trunk/dports/science/berkeleygw/Portfile	2016-03-20 20:06:37 UTC (rev 146915)
@@ -30,6 +30,13 @@
 depends_lib         port:fftw
 # fftw port always has a Fortran variant
 
+# May fail with +mpich +gcc5. Use +mpich +gfortran instead.
+# In file included from /opt/local/include/mpich-gcc5/mpi.h:2231:0,
+#                  from icm.cpp:86:
+# /opt/local/include/mpich-gcc5/mpicxx.h:22:4: error: #error 'Please use the same version of GCC and g++ for compiling MPICH and user MPI programs'
+#  #  error 'Please use the same version of GCC and g++ for compiling MPICH and user MPI programs'
+#     ^
+
 # WHAT DO WE DO WHEN meaning of 'gfortran' is updated? No record... Must rename to gfortran5 etc.
 
 # test hangs in Epsilon with OpenMPI, for unknown reason.
@@ -47,8 +54,10 @@
     depends_build-append  port:llvm-gcc42
 }
 
+# FIXME: this unnecessarily enforces scalapack also had same C compiler as we are using.
 if {[mpi_variant_isset]} {
     depends_lib-append  port:scalapack
+    mpi.enforce_variant     scalapack
 }
 
 # fftw is not universal
@@ -56,11 +65,6 @@
 
 # FIXME: add options for threads
 
-# FIXME: this unnecessarily enforces scalapack also had same C compiler as we are using.
-if {[mpi_variant_isset]} {
-    mpi.enforce_variant     scalapack
-}
-
 configure {
     system -W ${worksrcpath} "sed 's|/opt/local|${prefix}|' < config/generic.serial.macos.mk > arch.mk"
     reinplace -W ${worksrcpath} "s|MATHFLAG += -DHDF5||" arch.mk
@@ -105,7 +109,7 @@
 
 variant accelerate conflicts atlas openblas description {Build with linear algebra from built-in Accelerate framework} {
     depends_lib-append      port:veclibfort
-    set lapacklib           -lveclibfort
+    set lapacklib           -lvecLibFort
 }
 
 variant atlas conflicts accelerate openblas description {Build with linear algebra from ATLAS} {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160320/5dcda3b5/attachment.html>