[149293] trunk/dports/science/apbs/Portfile

[dstrubbe at macports.org]

Revision: 149293
          https://trac.macports.org/changeset/149293
Author:   dstrubbe at macports.org
Date:     2016-06-09 17:53:03 -0700 (Thu, 09 Jun 2016)
Log Message:
-----------
apbs: Use -stdlib=libc++ which may allow Eigen to work with clang on some versions of OSX. Supply proper Fortran flags. Use variables for C and C++ flags.

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

Modified: trunk/dports/science/apbs/Portfile
===================================================================
--- trunk/dports/science/apbs/Portfile	2016-06-09 18:51:12 UTC (rev 149292)
+++ trunk/dports/science/apbs/Portfile	2016-06-10 00:53:03 UTC (rev 149293)
@@ -46,15 +46,15 @@
 # how to solve: first 'make apbs_geoflow', then 'make all'
 use_parallel_build no
 
-# do +debug and +universal work?
+configure.optflags      -O3 -ffast-math
 configure.args-append   -DENABLE_OPENMP:BOOL=OFF \
                         -DENABLE_BEM=OFF \
-                        -DCMAKE_C_COMPILER_ARG1:STRING="-I${worksrcpath}/include -O3 -ffast-math" \
-                        -DCMAKE_CXX_COMPILER_ARG1:STRING="-I${worksrcpath}/include -O3 -ffast-math"
+                        -DCMAKE_C_COMPILER_ARG1:STRING="-I${worksrcpath}/include ${configure.cflags}" \
+                        -DCMAKE_CXX_COMPILER_ARG1:STRING="-I${worksrcpath}/include ${configure.cxxflags} -stdlib=libc++"
 
 # otherwise obsolete subport installation will fail on patch phase and not get to pre-configure error about replacement
 if {${subport} == ${name}} {
-    patchfiles              patch-CMakeLists.txt.diff patch-Eigen-include-path.diff
+    patchfiles              patch-CMakeLists.txt.diff patch-Eigen-include-path.diff patch-contrib-tabipb-CMakeLists.txt.diff
     if {[mpi_variant_isset]} {
         patchfiles-append   patch-tests-apbs_tester.py.diff
     }
@@ -136,6 +136,7 @@
         reinplace "s|-L\${LIBGFORTRAN_PATH} -lgfortran -ltabipb -lstdc\+\+|${compilers.libfortran} ${worksrcpath}/lib/libtabipb.a|" ${worksrcpath}/CMakeLists.txt
         # provide this information to subsidiary cmake command run in tabipb directory during build phase
         reinplace "s|CMAKE_ARGS|CMAKE_ARGS -DCMAKE_Fortran_COMPILER:STRING=${configure.fc}|" ${worksrcpath}/CMakeLists.txt
+        reinplace "s|FCFLAGS|${configure.fcflags}|g" ${worksrcpath}/contrib/tabipb/CMakeLists.txt
     }
 }
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160609/b02edfcf/attachment.html>