<pre style='margin:0'>
Herby Gillot (herbygillot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/d9ec93bd76c4b6edb6fd618dc12217e60179f893">https://github.com/macports/macports-ports/commit/d9ec93bd76c4b6edb6fd618dc12217e60179f893</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit d9ec93bd76c4b6edb6fd618dc12217e60179f893
</span>Author: Sergey Fedorov <vital.had@gmail.com>
AuthorDate: Wed Jan 18 10:42:50 2023 +0800
<span style='display:block; white-space:pre;color:#404040;'> R: use compilers consistently with R PG
</span>---
math/R/Portfile | 34 ++++++++++++++++++++++++++++++----
1 file changed, 30 insertions(+), 4 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 56942bee617..9e5a7455eff 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;'>@@ -4,11 +4,13 @@ PortSystem 1.0
</span> PortGroup compilers 1.0
PortGroup compiler_blacklist_versions 1.0
PortGroup active_variants 1.1
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup legacysupport 1.1
</span>
name R
# Remember to set revision to 0 when bumping version
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# And also to update Rversion in R PortGroup
</span> version 4.2.2
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 4
</span>
set branch [join [lrange [split ${version} .] 0 1] .]
categories math science
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -34,12 +36,32 @@ checksums rmd160 8cd37cfb2694c75e21e6ea1f9dc734e7b39d8a2e \
</span> sha256 0ff62b42ec51afa5713caee7c4fde7a0c45940ba39bef8c5c9487fef0c953df5 \
size 33987014
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Fails to configure with Xcode clang 4.6.3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-compiler.blacklist-append {clang < 500}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Avoid Apple clangs:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.blacklist-append {clang}
</span>
compilers.choose fc f77
compilers.setup require_fortran
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# We wanna ensure the same compiler is used for R itself and R packages.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# See R PortGroup.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[string match macports-clang-* ${configure.compiler}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set clang_v [
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ string range ${configure.compiler} [
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ string length macports-clang-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ] end
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append port:clang-${clang_v}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_run-append port:clang-${clang_v}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} elseif {[string match macports-gcc-* ${configure.compiler}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set gcc_v [
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ string range ${configure.compiler} [
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ string length macports-gcc-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ] end
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append port:gcc${gcc_v}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_run-append port:gcc${gcc_v}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> depends_build port:pkgconfig
depends_lib port:readline \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -61,6 +83,8 @@ depends_lib port:readline \
</span> port:gnutar \
port:xz
<span style='display:block; white-space:pre;background:#e0ffe0;'>+legacysupport.newest_darwin_requires_legacy 10
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # avoid finding ${prefix}/bin/xdg-open first
configure.env-append R_PDFVIEWER=/usr/bin/open \
R_BROWSER=/usr/bin/open
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -88,7 +112,7 @@ post-patch {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Note: gcc cannot be used for the C compiler. It will give:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Note: gcc may not be used for the C compiler on some OS X versions. It will give:
</span> #:info:build In file included from /usr/include/dispatch/dispatch.h:51:0,
#:info:build from /System/Library/Frameworks/CoreFoundation.framework/Headers/CFStream.h:15,
#:info:build from /System/Library/Frameworks/CoreFoundation.framework/Headers/CFPropertyList.h:13,
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -100,6 +124,7 @@ post-patch {
</span> #:info:build dispatch_block_t notification_block);
#:info:build ^
# However, use of compiler.blacklist *gcc* would remove the GCC Fortran compilers too.
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# gcc works fine on < 10.7. See also: https://trac.macports.org/ticket/66453
</span>
configure.pre_args --prefix=${frameworks_dir}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -227,6 +252,7 @@ variant quartz conflicts x11 {
</span>
variant java description {enable Java} {
PortGroup java 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> configure.args-replace --disable-java --enable-java
}
</pre><pre style='margin:0'>
</pre>