Skip to content

Commit bf62e00

Browse files
committed
R: update to 4.5.0, update compiler selection
Add missed x11 lib dependency Closes: https://trac.macports.org/ticket/71695 Closes: https://trac.macports.org/ticket/71727
1 parent 3536bee commit bf62e00

File tree

2 files changed

+20
-48
lines changed

2 files changed

+20
-48
lines changed

_resources/port1.0/group/R-1.0.tcl

+7-22
Original file line numberDiff line numberDiff line change
@@ -94,38 +94,23 @@ default categories "R science"
9494
# For w/e reason universal is presently disabled for R in Macports.
9595
default universal_variant no
9696

97-
compiler.cxx_standard 2011
97+
compiler.cxx_standard 2014
9898

9999
# Avoid Apple clangs:
100100
compiler.blacklist-append {clang}
101-
# Blacklist macports-clang-17+. See discussion: https://trac.macports.org/ticket/67144
101+
# Blacklist macports-clang-20+. See discussion: https://trac.macports.org/ticket/67144
102102
# for rationale. The decision when to migrate to a new compiler
103103
# is then in the hands of the R maintainers and will not change
104104
# from the current defaults when these get bumped centrally.
105105
# NOTE : Keep this setting in sync with the one in the R port.
106-
if { ${os.major} > 22 } {
107-
# https://trac.macports.org/ticket/70799
108-
compiler.blacklist-append {macports-clang-19} {macports-clang-2[0-9]}
109-
} else {
110-
compiler.blacklist-append {macports-clang-1[7-9]} {macports-clang-2[0-9]}
111-
}
112-
# Similarly, for gcc select the gcc13 variant of the compilers PG.
106+
compiler.blacklist-append {macports-clang-2[0-9]}
107+
# Similarly, for gcc select the gcc14 variant of the compilers PG.
113108
# This setting should also be kept in sync with that in the R Port.
114109
# Updates should be coordinated with the R maintainers.
115-
if { ${os.major} < 10 || ${os.major} > 22 } {
116-
# https://trac.macports.org/ticket/70799
117-
compiler.blacklist-append {macports-gcc-1[5-9]}
118-
} else {
119-
compiler.blacklist-append {macports-gcc-1[4-9]}
120-
}
110+
compiler.blacklist-append {macports-gcc-1[5-9]}
121111
# NOTE: upon the update to gcc14, please update the blacklist accordingly,
122112
# like it is done for clangs. We would prefer using the same version of gcc and gfortran.
123-
if { ${os.major} < 10 || ${os.major} > 22 } {
124-
# https://trac.macports.org/ticket/70799
125-
default_variants-append +gcc14
126-
} else {
127-
default_variants-append +gcc13
128-
}
113+
default_variants-append +gcc14
129114

130115
# R bakes in the compiler, so if it is built with ccache,
131116
# then it will require ccache to build R packages.
@@ -193,7 +178,7 @@ if {${os.platform} eq "darwin" && ${configure.cxx_stdlib} ne "libc++"} {
193178

194179
global prefix frameworks_dir
195180
# Please update R version here:
196-
set Rversion 4.4.3
181+
set Rversion 4.5.0
197182
set branch [join [lrange [split ${Rversion} .] 0 1] .]
198183
set packages ${frameworks_dir}/R.framework/Versions/${branch}/Resources/library
199184
set suffix .tar.gz

math/R/Portfile

+13-26
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ PortGroup legacysupport 1.1
88
name R
99
# Remember to set revision to 0 when bumping version
1010
# And also to update Rversion in R PortGroup
11-
version 4.4.3
11+
version 4.5.0
1212
revision 0
1313

1414
set branch [join [lrange [split ${version} .] 0 1] .]
@@ -33,40 +33,25 @@ homepage https://www.r-project.org
3333
master_sites https://cran.rstudio.com/src/base/R-4/ \
3434
https://cran.r-project.org/src/base/R-4/
3535

36-
checksums rmd160 eb32aec48a4332b6d4a45abcf81fa43e9467e004 \
37-
sha256 0d93d224442dea253c2b086f088db6d0d3cfd9b592cd5496e8cb2143e90fc9e8 \
38-
size 40234425
36+
checksums rmd160 c5b69d0522c76e38b046f080e2c2adfbda5e0826 \
37+
sha256 3b33ea113e0d1ddc9793874d5949cec2c7386f66e4abfb1cef9aec22846c3ce1 \
38+
size 40466335
3939

4040
# Avoid Apple clangs:
4141
compiler.blacklist-append {clang}
42-
# Blacklist macports-clang-17+. See discussion: https://trac.macports.org/ticket/67144
42+
# Blacklist macports-clang-20+. See discussion: https://trac.macports.org/ticket/67144
4343
# for rationale. The decision when to migrate to a new compiler
4444
# is then in the hands of the R maintainers and will not change
4545
# from the current defaults when these get bumped centrally.
46-
# NOTE : Keep this setting in sync with the one in the R portgroup.
47-
if { ${os.major} > 22 } {
48-
# https://trac.macports.org/ticket/70799
49-
compiler.blacklist-append {macports-clang-19} {macports-clang-2[0-9]}
50-
} else {
51-
compiler.blacklist-append {macports-clang-1[7-9]} {macports-clang-2[0-9]}
52-
}
53-
# Similarly, for gcc select the gcc13 variant of the compilers PG.
54-
# This setting should also be kept in sync with that in the R Portgroup.
46+
# NOTE : Keep this setting in sync with the one in the R port.
47+
compiler.blacklist-append {macports-clang-2[0-9]}
48+
# Similarly, for gcc select the gcc14 variant of the compilers PG.
49+
# This setting should also be kept in sync with that in the R Port.
5550
# Updates should be coordinated with the R maintainers.
56-
if { ${os.major} < 10 || ${os.major} > 22 } {
57-
# https://trac.macports.org/ticket/70799
58-
compiler.blacklist-append {macports-gcc-1[5-9]}
59-
} else {
60-
compiler.blacklist-append {macports-gcc-1[4-9]}
61-
}
51+
compiler.blacklist-append {macports-gcc-1[5-9]}
6252
# NOTE: upon the update to gcc14, please update the blacklist accordingly,
6353
# like it is done for clangs. We would prefer using the same version of gcc and gfortran.
64-
if { ${os.major} < 10 || ${os.major} > 22 } {
65-
# https://trac.macports.org/ticket/70799
66-
default_variants-append +gcc14
67-
} else {
68-
default_variants-append +gcc13
69-
}
54+
default_variants-append +gcc14
7055

7156
# When switching to gcc14, make sure to add this flag when gcc is used
7257
# as the primary compiler: -Wno-error=incompatible-pointer-types
@@ -80,6 +65,7 @@ configure.ccache no
8065

8166
compilers.choose fc f77
8267
compilers.setup require_fortran
68+
compiler.cxx_standard 2014
8369

8470
# https://trac.macports.org/ticket/69849
8571
# https://bugs.r-project.org/show_bug.cgi?id=18713
@@ -276,6 +262,7 @@ variant x11 conflicts quartz {
276262
depends_lib-append port:xorg-libice \
277263
port:xorg-libsm \
278264
port:xorg-libX11 \
265+
port:xorg-libXmu \
279266
port:xorg-libXt
280267
configure.args-delete --without-x
281268
configure.args-append --with-x \

0 commit comments

Comments
 (0)