<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/1bf8d4b4e5d52b3202e5415ea7c4e55409400a60">https://github.com/macports/macports-ports/commit/1bf8d4b4e5d52b3202e5415ea7c4e55409400a60</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 1bf8d4b4e5d52b3202e5415ea7c4e55409400a60
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Fri Nov 24 00:56:36 2017 -0700
<span style='display:block; white-space:pre;color:#404040;'> mpich: remove build flags from wrapper scripts
</span>---
science/mpich/Portfile | 33 ++++++++++++++++++++++++++++++---
1 file changed, 30 insertions(+), 3 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/mpich/Portfile b/science/mpich/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 2f86359..a2f9123 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/mpich/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/mpich/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -51,7 +51,7 @@ livecheck.url ${homepage}/static/downloads/
</span> if {[string first "-devel" $subport] > 0} {
name mpich-devel
version 3.3a2
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 2
</span> # To see 3.2 as newer than 3.2rcX
epoch 2
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -187,6 +187,33 @@ if {${subport} != ${name}} {
</span> # https://lists.mpich.org/pipermail/discuss/2017-November/005350.html
patchfiles-append patch-pkt_CTS_handler.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # setting xFLAGS resulting in mpicc, etc. always using these flags
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # setting MPICHLIB_xFLAGS only uses them for building the library
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach env_var {CFLAGS CPPFLAGS CXXFLAGS FFLAGS FCFLAGS} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MPICHLIB_${env_var}=\"\$${env_var}\" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${env_var}=""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # remove LDFLAGS mpicc, etc. and pkgconfig files
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-build {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set archs ${build_arch}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach arch ${archs} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set dir ${worksrcpath}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach f [glob \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${dir}/src/env/*.bash \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${dir}/src/env/*.sh \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${dir}/src/packaging/pkgconfig/*.pc] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "s| ${configure.ldflags}||g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${f}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "s| -arch ${arch}||g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${f}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> post-destroot {
if {[string first "-devel" $subport] > 0} {
# Supply our own -devel manpages (might be materially different /
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -210,7 +237,7 @@ if {${subport} != ${name}} {
</span>
if { [string first gcc $cname] == 0 } {
append long_description " AND FORTRAN COMPILERS"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 2
</span> configure.args-delete --disable-fortran
configure.args-append --enable-fortran
select.file ${filespath}/${name}-${cname}-fortran
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -240,7 +267,7 @@ if {${subport} != ${name}} {
</span> }
} else {
append long_description " (AND THE FORTRAN COMPILER SELECTED BY THE VARIANT, IF ANY)"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 2
</span>
compilers.choose fc f77 f90
compilers.setup -dragonegg default_fortran
</pre><pre style='margin:0'>
</pre>