<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/af47c04a24ab65239f211c614a7d76067a5966b9">https://github.com/macports/macports-ports/commit/af47c04a24ab65239f211c614a7d76067a5966b9</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 af47c04a24a R: fix a bug breaking installation of some packages on 32-bit platforms
</span>af47c04a24a is described below
<span style='display:block; white-space:pre;color:#808000;'>commit af47c04a24ab65239f211c614a7d76067a5966b9
</span>Author: barracuda156 <vital.had@gmail.com>
AuthorDate: Tue Apr 30 02:08:20 2024 +0800
<span style='display:block; white-space:pre;color:#404040;'> R: fix a bug breaking installation of some packages on 32-bit platforms
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes: https://trac.macports.org/ticket/69849
</span>---
math/R/Portfile | 8 +++++++-
math/R/files/patch-fix-memsize.diff | 17 +++++++++++++++++
2 files changed, 24 insertions(+), 1 deletion(-)
<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 a3596d18aad..b4482cc1699 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;'>@@ -9,7 +9,7 @@ name R
</span> # Remember to set revision to 0 when bumping version
# And also to update Rversion in R PortGroup
version 4.4.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span>
set branch [join [lrange [split ${version} .] 0 1] .]
categories math science
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -60,6 +60,12 @@ if {${os.platform} eq "darwin" && ${os.major} < 10} {
</span> compilers.choose fc f77
compilers.setup require_fortran
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://trac.macports.org/ticket/69849
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://bugs.r-project.org/show_bug.cgi?id=18713
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${configure.build_arch} in [list i386 ppc]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-fix-memsize.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # https://trac.macports.org/ticket/67298
# https://bugs.r-project.org/show_bug.cgi?id=18520
# See related: https://skia.googlesource.com/skia/+/3490263287e9432119c501884e45840de4d986bc
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/R/files/patch-fix-memsize.diff b/math/R/files/patch-fix-memsize.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..e218c0840f2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/R/files/patch-fix-memsize.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,17 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/main/startup.c 2024-03-27 07:02:08.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/main/startup.c 2024-04-30 01:36:27.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -244,10 +244,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Setting the limit at the maximum of 16Gb and available physical
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ memory seems reasonable, but there may be better options. LT */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- R_size_t pages = sysconf(_SC_PHYS_PAGES);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- R_size_t page_size = sysconf(_SC_PAGE_SIZE);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- R_size_t sysmem = pages * page_size;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- R_size_t MinMaxVSize = 17179869184; /* 16 Gb */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ double pages = sysconf(_SC_PHYS_PAGES);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ double page_size = sysconf(_SC_PAGE_SIZE);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ double sysmem = pages * page_size;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ double MinMaxVSize = 17179869184; /* 16 Gb */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Rp->max_vsize = sysmem > MinMaxVSize ? sysmem : MinMaxVSize;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span></pre><pre style='margin:0'>
</pre>