<pre style='margin:0'>
David Strubbe (dstrubbe) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/1cc54ef9f65c9add7b0feb90a1aaf877121c5df8">https://github.com/macports/macports-ports/commit/1cc54ef9f65c9add7b0feb90a1aaf877121c5df8</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 1cc54ef9f65 berkeleygw: Enable use of gcc10, and use hw.activecpu instead of hw.ncpu for test parallelization.
</span>1cc54ef9f65 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 1cc54ef9f65c9add7b0feb90a1aaf877121c5df8
</span>Author: David Strubbe <dstrubbe@macports.org>
AuthorDate: Wed Jul 1 17:10:15 2020 -0700
<span style='display:block; white-space:pre;color:#404040;'> berkeleygw: Enable use of gcc10, and use hw.activecpu instead of hw.ncpu for test parallelization.
</span>---
science/berkeleygw/Portfile | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/berkeleygw/Portfile b/science/berkeleygw/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 7a50dc61ac2..10aa2381782 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/berkeleygw/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/berkeleygw/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -43,6 +43,7 @@ if {![variant_isset fftw2]} {
</span> # WHAT DO WE DO WHEN meaning of 'gfortran' is updated? No record... Maybe rename to gfortran5 etc. ?
compilers.choose fc cc cxx cpp
<span style='display:block; white-space:pre;background:#e0ffe0;'>+compilers.allow_arguments_mismatch yes
</span> mpi.setup require_fortran -g95
# won't compile with g95
#In file Common/timing.p.f:289
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -85,7 +86,7 @@ pre-test {
</span> test.target check-jobscript
# FIXME: what about with threads? set OMP_NUM_THREADS=2 and divide ncpus by 2.
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {![catch {sysctl hw.ncpu} ncpus]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![catch {sysctl hw.activecpu} ncpus]} {
</span> test.env-append BGW_TEST_MPI_NPROCS=$ncpus
}
ui_msg "Running testsuite in parallel with $ncpus MPI tasks"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -119,9 +120,11 @@ pre-build {
</span> set mathflag "${mathflag} -DUSEFFTW3"
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.fcflags-append -ffree-form -fno-second-underscore
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> if {[variant_isset g95]} {
build.args-append COMPFLAG="-DG95" FCPP="${configure.cc} -E -x c -P -ansi" MOD_OPT="-fmod=" \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- F90free="${prefix}/bin/g95 -ffree-form -ffree-line-length-huge -fno-second-underscore"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ F90free="${configure.fc} -ffree-line-length-huge ${configure.fcflags}"
</span> # test, destroot args needed just to avoid trying to build in the test/openmp directory unnecessarily
test.args-append COMPFLAG="-DG95"
destroot.args-append COMPFLAG="-DG95"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -134,7 +137,7 @@ pre-build {
</span> }
# gcc is default in arch.mk so most things do not need to be modified
<span style='display:block; white-space:pre;background:#ffe0e0;'>- build.args-append F90free="${configure.fc} -ffree-form -ffree-line-length-none -fno-second-underscore"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.args-append F90free="${configure.fc} -ffree-line-length-none ${configure.fcflags}"
</span> }
if {[variant_isset threads]} {
</pre><pre style='margin:0'>
</pre>