<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/13b89c0f4d33421fddc6bc26ad5786a6a2bc2e5b">https://github.com/macports/macports-ports/commit/13b89c0f4d33421fddc6bc26ad5786a6a2bc2e5b</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 13b89c0f4d33421fddc6bc26ad5786a6a2bc2e5b
</span>Author: Sergey Fedorov <vital.had@gmail.com>
AuthorDate: Wed Jan 18 11:10:08 2023 +0800
<span style='display:block; white-space:pre;color:#404040;'> R-RcppParallel: new port
</span>---
R/R-RcppParallel/Portfile | 58 ++++++++++++++++++++++
R/R-RcppParallel/files/0001-Fix-macos.inc.patch | 37 ++++++++++++++
.../files/0002-proxy_overload-for-10.7.patch | 42 ++++++++++++++++
3 files changed, 137 insertions(+)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/R/R-RcppParallel/Portfile b/R/R-RcppParallel/Portfile
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..e65017ef09c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/R/R-RcppParallel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,58 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortSystem 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup R 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+R.setup cran RcppCore RcppParallel 5.1.6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+categories-append devel
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers {@barracuda156 gmail.com:vital.had} openmaintainer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+license GPL-3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+description High level functions for parallel programming with Rcpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+long_description {*}${description}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage https://rcppcore.github.io/RcppParallel
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 5286a2505f4dc7c4c4760e02be117cd15e71f939 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 ac560d868e9757a93ddbf176dfd851fc753f67919476f88e248fe94cba4f0f15 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 1968228
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patch.pre_args -p1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles 0001-Fix-macos.inc.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0002-proxy_overload-for-10.7.patch
</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|@MACOS_V@|${macosx_deployment_target}|" ${worksrcpath}/src/tbb/build/macos.inc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # https://github.com/RcppCore/RcppParallel/issues/176
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[string match *gcc* ${configure.compiler}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # "gcc-mp-12" is not supported on macos. Add build/macos.gcc-mp-12.inc file with compiler-specific settings.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|@CC@|gcc|g" ${worksrcpath}/src/tbb/build/macos.inc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Don't use libcxx with gcc.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|@STDLIB@|libstdc++|" ${worksrcpath}/src/tbb/build/macos.inc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # This just reverts the patch to Clang hardcoding:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|@CC@|clang|g" ${worksrcpath}/src/tbb/build/macos.inc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|@STDLIB@|libc++|" ${worksrcpath}/src/tbb/build/macos.inc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+platform powerpc {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Otherwise configure script does nonsense, setting arch to ppc64 on G5 – regardless of Macports settings and OS support of ppc64.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${build_arch} eq "ppc64"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.env-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ arch=ppc64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ destroot.env-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ arch=ppc64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.env-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ arch=ppc32
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ destroot.env-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ arch=ppc32
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# It is also possible to configure RcppParallel to use external TBB:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://github.com/RcppCore/RcppParallel
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# This has not been tested though.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# depends_lib-append path:lib/libtbb.dylib:onetbb
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# configure.args-append TBB=${prefix} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# TBB_INC=${prefix}include/tbb \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# TBB_LIB=${prefix}/lib
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/R/R-RcppParallel/files/0001-Fix-macos.inc.patch b/R/R-RcppParallel/files/0001-Fix-macos.inc.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..a516409776d
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/R/R-RcppParallel/files/0001-Fix-macos.inc.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,37 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 64c0dbb74fa0756ce9bd66f90b3804c18b725c2b Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Sergey Fedorov <vital.had@gmail.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Tue, 6 Dec 2022 17:45:27 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] Fix macos.inc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/tbb/build/macos.inc | 8 ++++----
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 4 insertions(+), 4 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/tbb/build/macos.inc b/src/tbb/build/macos.inc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 5011fc17..d2ce2bfb 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/src/tbb/build/macos.inc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/src/tbb/build/macos.inc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -56,11 +56,11 @@ ifndef runtime
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ export runtime:=cc$(clang_version)_os$(os_version)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-native_compiler := clang
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-export compiler ?= clang
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++native_compiler := @CC@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++export compiler ?= @CC@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ debugger ?= lldb
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-export stdlib ?= libc++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++export stdlib ?= @STDLIB@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CMD=$(SHELL) -c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CWD=$(shell pwd)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -106,4 +106,4 @@ TEST_LAUNCHER=sh $(tbb_root)/build/test_launcher.sh $(largs)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ OPENCL.LIB = -framework OpenCL
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-MACOSX_DEPLOYMENT_TARGET ?= 10.11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++MACOSX_DEPLOYMENT_TARGET ?= @MACOS_V@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.38.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/R/R-RcppParallel/files/0002-proxy_overload-for-10.7.patch b/R/R-RcppParallel/files/0002-proxy_overload-for-10.7.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..03cf71ffe57
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/R/R-RcppParallel/files/0002-proxy_overload-for-10.7.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,42 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 9a4199cfd0ce961db62f97256fabfdc24b8d5e52 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Sergey Fedorov <vital.had@gmail.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Tue, 6 Dec 2022 18:11:18 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] proxy_overload for <10.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/tbb/src/tbbmalloc/proxy_overload_osx.h | 6 ++++--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 4 insertions(+), 2 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/tbb/src/tbbmalloc/proxy_overload_osx.h b/src/tbb/src/tbbmalloc/proxy_overload_osx.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 39790db7..9b1dd030 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/src/tbb/src/tbbmalloc/proxy_overload_osx.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/src/tbb/src/tbbmalloc/proxy_overload_osx.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -134,11 +134,12 @@ struct DoMallocReplacement {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ introspect.force_lock = &zone_force_lock;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ introspect.force_unlock = &zone_force_unlock;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ introspect.statistics = zone_statistics;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if __MAC_OS_X_VERSION_MAX_ALLOWED >= 1070
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ introspect.zone_locked = &zone_locked;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ introspect.enable_discharge_checking = &impl_zone_enable_discharge_checking;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ introspect.disable_discharge_checking = &impl_zone_disable_discharge_checking;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ introspect.discharge = &impl_zone_discharge;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ zone.size = &impl_malloc_usable_size;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ zone.malloc = &impl_malloc;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ zone.calloc = &impl_calloc;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -150,9 +151,10 @@ struct DoMallocReplacement {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ zone.introspect = &introspect;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ zone.version = 8;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ zone.memalign = impl_memalign;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if __MAC_OS_X_VERSION_MAX_ALLOWED >= 1070
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ zone.free_definite_size = &impl_free_definite_size;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ zone.pressure_relief = &impl_pressure_relief;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // make sure that default purgeable zone is initialized
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ malloc_default_purgeable_zone();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void* ptr = malloc(1);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.38.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span></pre><pre style='margin:0'>
</pre>