<pre style='margin:0'>
Renee Otten (reneeotten) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/8d6797924496c6728fd112ad860c8cef12666394">https://github.com/macports/macports-ports/commit/8d6797924496c6728fd112ad860c8cef12666394</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 8d6797924496c6728fd112ad860c8cef12666394
</span>Author: Sergey Fedorov <barracuda@macos-powerpc.org>
AuthorDate: Sat Nov 2 05:31:04 2024 +0800
<span style='display:block; white-space:pre;color:#404040;'> R-data.table: update to 1.16.2
</span>---
R/R-data.table/Portfile | 35 +++++++++---------------
R/R-data.table/files/patch-fix-omp.diff | 48 ++++++++++++---------------------
2 files changed, 30 insertions(+), 53 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/R/R-data.table/Portfile b/R/R-data.table/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index e19fa9bf07a..c53a1940b2c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/R/R-data.table/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/R/R-data.table/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,16 +3,16 @@
</span> PortSystem 1.0
PortGroup R 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-R.setup github Rdatatable data.table 1.16.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+R.setup github Rdatatable data.table 1.16.2
</span> revision 0
maintainers {@barracuda156 gmail.com:vital.had} openmaintainer
license MPL-2
description Extension of data.frame
long_description {*}${description}
homepage https://r-datatable.com
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 4cc19daa70f4350de2cf5dd27fbf1cba15d134ae \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 547236a8b4d36fa13486f23339fc9719bdf2d4a984aa25f72ade4ddd25990bff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 5751016
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 8bda6bc0254bbd0c38cdbde8a4383d10a0fab949 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 737c09a5d8d3abf12ade9ad32dab1475c3def570a2856376de343d79bd1f214a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 5937777
</span> github.tarball_from archive
depends_build-append \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20,26 +20,17 @@ depends_build-append \
</span>
depends_lib-append port:zlib
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant openmp description "Enable OpenMP support" {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # In 1.16.0 OpenMP detection got broken further by
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # https://github.com/Rdatatable/data.table/commit/096b20f1f1b9788787a826ba3d32177ed9836352
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # See: https://github.com/Rdatatable/data.table/issues/6409
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # We modify the patch, so that OpenMP works again.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles patch-fix-omp.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s,@MP_OPENMP_FLAGS@,-fopenmp," ${worksrcpath}/configure
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[string match *gcc* ${configure.compiler}]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s,@MP_OPENMP_CFLAGS@,," ${worksrcpath}/configure
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s,@MP_OPENMP_LFLAGS@,," ${worksrcpath}/configure
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } elseif {[string match *clang* ${configure.compiler}]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s,@MP_OPENMP_CFLAGS@,-I${prefix}/include/libomp," ${worksrcpath}/configure
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s,@MP_OPENMP_LFLAGS@,-L${prefix}/lib/libomp -lomp," ${worksrcpath}/configure
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- compiler.openmp_version 3.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# We only need the right paths for builds with clang,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# since finally the check works correctly after:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://github.com/Rdatatable/data.table/issues/6409
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-fix-omp.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s,@PREFIX@,${prefix},g" ${worksrcpath}/configure
</span> }
<span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.openmp_version 3.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> depends_test-append port:R-bit \
port:R-bit64 \
port:R-knitr \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/R/R-data.table/files/patch-fix-omp.diff b/R/R-data.table/files/patch-fix-omp.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 69a649e941f..4ef1f8f8c7f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/R/R-data.table/files/patch-fix-omp.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/R/R-data.table/files/patch-fix-omp.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,21 +1,20 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure 2024-08-27 13:33:10.000000000 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure 2024-08-27 15:36:45.000000000 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -109,38 +109,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if [ "$(uname)" = "Darwin" ]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- # https://mac.r-project.org/openmp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- printf "%s" "* checking if R installation supports OpenMP with \"-Xclang -fopenmp\" ... "
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if CPPFLAGS="${CPPFLAGS} -Xclang -fopenmp" PKG_LIBS="-lomp" "${R_HOME}/bin/R" CMD SHLIB test-omp.c >> config.log 2>&1; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- echo "yes"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure 2024-10-11 10:50:25.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure 2024-11-02 04:49:39.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -113,8 +113,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ printf "%s" "* checking if R installation supports OpenMP with \"-Xclang -fopenmp\" ... "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if CPPFLAGS="${CPPFLAGS} -Xclang -fopenmp" PKG_LIBS="-lomp" "${R_HOME}/bin/R" CMD SHLIB test-omp.c >> config.log 2>&1; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ echo "yes"
</span> - export PKG_CFLAGS="${PKG_CFLAGS} -Xclang -fopenmp"
- export PKG_LIBS="${PKG_LIBS} -lomp"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- export R_OPENMP_ENABLED=1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- echo "no"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ export PKG_CFLAGS="${PKG_CFLAGS} -I@PREFIX@/include/libomp -Xclang -fopenmp"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ export PKG_LIBS="${PKG_LIBS} -L@PREFIX@/lib/libomp -lomp"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ export R_OPENMP_ENABLED=1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -132,27 +132,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ echo "no"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> - if [ "$(uname -m)" = "arm64" ]; then
- HOMEBREW_PREFIX=/opt/homebrew
- else
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -36,20 +35,7 @@
</span> - echo "no"
- fi
- fi
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # Instead of using a defunct check, just set the right variables for OpenMP to work.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ export PKG_CFLAGS="${PKG_CFLAGS} @MP_OPENMP_CFLAGS@"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ export PKG_LIBS="${PKG_LIBS} @MP_OPENMP_LFLAGS@"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ export R_OPENMP_ENABLED=1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span> fi # uname=Darwin
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -162,7 +135,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "***"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sed -e "s|@openmp_cflags@||" src/Makevars.in > src/Makevars
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- sed -e "s|@openmp_cflags@|\$(SHLIB_OPENMP_CFLAGS)|" src/Makevars.in > src/Makevars
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ sed -e "s|@openmp_cflags@|@MP_OPENMP_FLAGS@|" src/Makevars.in > src/Makevars
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # retain user supplied PKG_ env variables, #4664. See comments in Makevars.in too.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # No support for OpenMP available
</span></pre><pre style='margin:0'>
</pre>