<pre style='margin:0'>
Marcus Calhoun-Lopez (MarcusCalhoun-Lopez) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/fed87bb8ea2d76e7d5490df42c9d15300f113d3e">https://github.com/macports/macports-ports/commit/fed87bb8ea2d76e7d5490df42c9d15300f113d3e</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit fed87bb8ea2d76e7d5490df42c9d15300f113d3e
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Sun Aug 26 23:05:14 2018 -0700
<span style='display:block; white-space:pre;color:#404040;'> petsc: respect MacPorts architecture flags
</span>---
math/petsc/Portfile | 30 ++++++++++++++++--------------
1 file changed, 16 insertions(+), 14 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/petsc/Portfile b/math/petsc/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 8cec8b9..6556d0d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/petsc/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/petsc/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,7 +6,7 @@ PortGroup linear_algebra 1.0
</span> PortGroup mpi 1.0
bitbucket.setup petsc petsc 3.8.3 v
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 2
</span> categories math science
maintainers {sean @seanfarley}
license BSD
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -39,23 +39,14 @@ post-patch {
</span>
pre-configure {
configure.args-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- CC="${configure.cc}" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CXX="${configure.cxx}" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- FC="${configure.fc}" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- F77="${configure.fc}" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- F90="${configure.fc}" \
</span> COPTFLAGS="${configure.optflags}" \
CXXOPTFLAGS="${configure.optflags}" \
FOPTFLAGS="${configure.optflags}" \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- LDFLAGS="${configure.ldflags}" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CPPFLAGS="${configure.cppflags}" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CFLAGS="${configure.cflags} ${configure.cc_archflags}" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CXXFLAGS="${configure.cxxflags}" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- FFLAGS="${configure.fcflags}" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- FCFLAGS="${configure.fcflags}" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- F90FLAGS="${configure.fcflags}" \
</span> PETSC_ARCH="arch-macports"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # avoid duplication of optflags
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.optflags
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> if {[mpi_variant_isset]} {
configure.args-delete --with-mpi=0 \
--with-fc=0
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -64,6 +55,17 @@ pre-configure {
</span> configure.args-delete --with-fc=0
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # base does not quite handle Fortran flags correctly
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${build_arch} eq "x86_64" || ${build_arch} eq "ppc64"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.fc_archflags -m64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.f90_archflags -m64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.fflags-append -m64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.fc_archflags -m32
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.fflags-append -m32
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.f90_archflags -m32
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
subport petsc-devel {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -83,7 +85,7 @@ notes "Add the following line to your .bash_profile if you plan to
</span>
configure.pre_args --prefix=${prefix}/lib/${name}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args --with-environment-variables=1 \
</span> --with-valgrind=0 \
--with-mpi=0 \
--with-fc=0 \
</pre><pre style='margin:0'>
</pre>