<pre style='margin:0'>
Zhenfu Shi (i0ntempest) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/71899c63ad7c5953b9313aeca35bd7aa44c019c9">https://github.com/macports/macports-ports/commit/71899c63ad7c5953b9313aeca35bd7aa44c019c9</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 71899c63ad7 R: Add openmp variant & change openblas variant to lowercase (#8614)
</span>71899c63ad7 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 71899c63ad7c5953b9313aeca35bd7aa44c019c9
</span>Author: Zhenfu Shi <szf1234@me.com>
AuthorDate: Sat Oct 3 12:02:26 2020 -0400
<span style='display:block; white-space:pre;color:#404040;'> R: Add openmp variant & change openblas variant to lowercase (#8614)
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> This new variant makes sure the user has OpenMP library and a OpenMP supported compiler installed to build and use OpenMP enabled R packages. OpenMP support is now explicitly disabled before build if the variant is not selected to avoid undeclared dependency.
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/61256
</span>---
math/R/Portfile | 26 ++++++++++++++++++--------
1 file changed, 18 insertions(+), 8 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/R/Portfile b/math/R/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 5713649a3b7..abf45a08dec 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/R/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/R/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -8,7 +8,7 @@ PortGroup active_variants 1.1
</span> name R
# Remember to set revision to 0 when bumping version
version 4.0.2
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 2
</span>
set branch [join [lrange [split ${version} .] 0 1] .]
categories math science
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -96,7 +96,8 @@ post-patch {
</span>
configure.pre_args --prefix=${frameworks_dir}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args --enable-R-framework \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args --disable-openmp \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-R-framework \
</span> --enable-memory-profiling \
--enable-R-shlib \
--enable-BLAS-shlib \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -115,26 +116,35 @@ platform darwin 13 {
</span> configure.cflags-append -flax-vector-conversions
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant accelerate conflicts atlas builtin_lapack OpenBLAS description {build using the BLAS and Lapack in Apple's Accelerate framework} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant accelerate conflicts atlas builtin_lapack openblas description {build using the BLAS and Lapack in Apple's Accelerate framework} {
</span> configure.args-append --with-blas="-framework Accelerate" --with-lapack
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant atlas conflicts accelerate builtin_lapack OpenBLAS description {build using the BLAS in the atlas port} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant atlas conflicts accelerate builtin_lapack openblas description {build using the BLAS in the atlas port} {
</span> depends_lib-append port:atlas
configure.args-append --with-blas="-L${prefix}/lib -lptf77blas -latlas"
#See A.3.2 in R Installation and Administration for why atlas LAPACK not used
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant builtin_lapack conflicts accelerate atlas OpenBLAS description {build using reference BLAS and Lapack} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant builtin_lapack conflicts accelerate atlas openblas description {build using reference BLAS and Lapack} {
</span> configure.args-append --without-blas --without-lapack
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant OpenBLAS conflicts builtin_lapack accelerate atlas description {build using the BLAS and Lapack in the OpenBLAS port} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant openblas conflicts builtin_lapack accelerate atlas description {build using the BLAS and Lapack in the OpenBLAS port} {
</span> depends_lib-append port:OpenBLAS
configure.args-delete --enable-BLAS-shlib
configure.args-append --with-blas="-L${prefix}/lib -lopenblas" --with-lapack
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+variant openmp description {enable parallelism support using OpenMP} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ compiler.openmp_version 4.5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace --disable-openmp --enable-openmp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ notes-append "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Clang compilers provided by Xcode do not support OpenMP. Some R packages using\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ OpenMP may require additional flags in the Makevar file (e.g. data.table) to\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build. Please consult package documentation."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> variant cairo description {use cairo and pango} {
depends_lib-append path:lib/pkgconfig/cairo.pc:cairo \
path:lib/pkgconfig/pango.pc:pango \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -192,7 +202,7 @@ variant java description {enable Java} {
</span> configure.args-replace --disable-java --enable-java
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-default_variants +cairo +recommended
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default_variants +cairo +recommended +openmp
</span>
if {![variant_isset quartz]} {
default_variants-append +x11
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -208,7 +218,7 @@ if {[variant_isset cairo] && [variant_isset quartz]} {
</span> require_active_variants path:lib/pkgconfig/pango.pc:pango quartz
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![variant_isset accelerate] && ![variant_isset atlas] && ![variant_isset OpenBLAS] && ![variant_isset builtin_lapack]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {![variant_isset accelerate] && ![variant_isset atlas] && ![variant_isset openblas] && ![variant_isset builtin_lapack]} {
</span> default_variants-append +builtin_lapack
}
</pre><pre style='margin:0'>
</pre>