<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/482849120e65b5a27205858678be4a9f4eba0272">https://github.com/macports/macports-ports/commit/482849120e65b5a27205858678be4a9f4eba0272</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 482849120e65b5a27205858678be4a9f4eba0272
</span>Author: Sergey Fedorov <vital.had@gmail.com>
AuthorDate: Mon Feb 27 03:24:50 2023 +0800

<span style='display:block; white-space:pre;color:#404040;'>    R-RcppParallel: fix tests
</span>---
 R/R-RcppParallel/Portfile                       | 27 ++++++++++++++++++++++++-
 R/R-RcppParallel/files/0003-patch-tbb-arch.diff | 13 ++++++++++++
 2 files changed, 39 insertions(+), 1 deletion(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/R/R-RcppParallel/Portfile b/R/R-RcppParallel/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index e65017ef09c..0b6e104d56a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/R/R-RcppParallel/Portfile
</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;'>@@ -17,7 +17,8 @@ checksums           rmd160  5286a2505f4dc7c4c4760e02be117cd15e71f939 \
</span> 
 patch.pre_args      -p1
 patchfiles          0001-Fix-macos.inc.patch \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                    0002-proxy_overload-for-10.7.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;'>+                    0003-patch-tbb-arch.diff
</span> 
 post-patch {
     reinplace "s|@MACOS_V@|${macosx_deployment_target}|" ${worksrcpath}/src/tbb/build/macos.inc
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -32,6 +33,19 @@ post-patch {
</span>         reinplace "s|@CC@|clang|g" ${worksrcpath}/src/tbb/build/macos.inc
         reinplace "s|@STDLIB@|libc++|" ${worksrcpath}/src/tbb/build/macos.inc
     }
<span style='display:block; white-space:pre;background:#e0ffe0;'>+    # Propagating arch via env does not work for tests. Notice, the following
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    # implies monoarch build. If R goes universal, alternative solution will be needed.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    if {${build_arch} eq "arm64"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        reinplace "s|@TBB_ARCH@|arm64|" ${worksrcpath}/src/Makevars.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    } elseif {${build_arch} eq "i386"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        reinplace "s|@TBB_ARCH@|ia32|" ${worksrcpath}/src/Makevars.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    } elseif {${build_arch} eq "ppc"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        reinplace "s|@TBB_ARCH@|ppc32|" ${worksrcpath}/src/Makevars.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    } elseif {${build_arch} eq "ppc64"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        reinplace "s|@TBB_ARCH@|ppc64|" ${worksrcpath}/src/Makevars.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    } elseif {${build_arch} eq "x86_64"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        reinplace "s|@TBB_ARCH@|intel64|" ${worksrcpath}/src/Makevars.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    }
</span> }
 
 platform powerpc {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -41,11 +55,15 @@ platform powerpc {
</span>                     arch=ppc64
         destroot.env-append \
                     arch=ppc64
<span style='display:block; white-space:pre;background:#e0ffe0;'>+        test.env-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    arch=ppc64
</span>     } else {
         configure.env-append \
                     arch=ppc32
         destroot.env-append \
                     arch=ppc32
<span style='display:block; white-space:pre;background:#e0ffe0;'>+        test.env-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    arch=ppc32
</span>     }
 }
 
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -56,3 +74,10 @@ platform powerpc {
</span> # configure.args-append   TBB=${prefix} \
 #                         TBB_INC=${prefix}include/tbb \
 #                         TBB_LIB=${prefix}/lib
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_test-append port:R-knitr \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    port:R-Rcpp \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    port:R-rmarkdown \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    port:R-RUnit
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+test.run            yes
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/R/R-RcppParallel/files/0003-patch-tbb-arch.diff b/R/R-RcppParallel/files/0003-patch-tbb-arch.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..56a788dbef4
</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/0003-patch-tbb-arch.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/src/Makevars.in      2023-02-27 02:54:45.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/src/Makevars.in      2023-02-27 02:55:13.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -105,6 +105,10 @@
</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;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ifeq ($(USE_TBB), Mac)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++    MAKE_ARGS += arch=@TBB_ARCH@
</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;'>+ # write compiler if set
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ifneq (@COMPILER@, )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   MAKE_ARGS += compiler=@COMPILER@
</span></pre><pre style='margin:0'>

</pre>