<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/807680c65d714ff6ed3100f0df44aeb764a034c7">https://github.com/macports/macports-ports/commit/807680c65d714ff6ed3100f0df44aeb764a034c7</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 807680c65d714ff6ed3100f0df44aeb764a034c7
</span>Author: Sergey Fedorov <vital.had@gmail.com>
AuthorDate: Fri Sep 8 21:40:29 2023 +0700
<span style='display:block; white-space:pre;color:#404040;'> R-QuickJSR: update to 1.0.5
</span>---
R/R-QuickJSR/Portfile | 17 ++++++++++-------
R/R-QuickJSR/files/patch-libatomic.diff | 12 +++++++++---
2 files changed, 19 insertions(+), 10 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/R/R-QuickJSR/Portfile b/R/R-QuickJSR/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 300b5f5e25e..5d3e4f21380 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/R/R-QuickJSR/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/R/R-QuickJSR/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,23 +3,26 @@
</span> PortSystem 1.0
PortGroup R 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-R.setup cran andrjohns QuickJSR 1.0.4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+R.setup cran andrjohns QuickJSR 1.0.5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> categories-append devel
maintainers {@barracuda156 gmail.com:vital.had} openmaintainer
license MIT
description Interface for the QuickJS light-weight JavaScript engine
long_description {*}${description}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 b6940945fd8d84ce6f53990958cc7616b9c1006f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 80d5c308be04f2a1385e3a808c115d97b5b0a24fc483ff659092fe956c1cd285 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 504670
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 890d044e1f3ef8e6760833540417020946a7a065 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 973674a14343f26cf8fede04fcd1c9c1968fe896f0c645660e05a2a925a98951 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 504577
</span>
depends_lib-append port:R-jsonlite \
port:R-R6 \
port:R-Rcpp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# https://github.com/andrjohns/QuickJSR/issues/1
</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:#e0ffe0;'>+# Native ppc build has been fixed in: https://github.com/andrjohns/QuickJSR/commit/07fb3893d29fa17658a8cb8b17ffd2aba4453280
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# See: https://github.com/andrjohns/QuickJSR/issues/1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# However the solution used relies on uname, which leaves Rosetta build broken.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# We do not need to guess here and can fix flags directly.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[string match macports-gcc* ${configure.compiler}] && (${configure.build_arch} in [list i386 ppc])} {
</span> patchfiles patch-libatomic.diff
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/R/R-QuickJSR/files/patch-libatomic.diff b/R/R-QuickJSR/files/patch-libatomic.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index b3e186db49d..bc8c8217179 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/R/R-QuickJSR/files/patch-libatomic.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/R/R-QuickJSR/files/patch-libatomic.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,9 +1,15 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/Makevars.orig 2023-04-16 19:11:52.000000000 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/Makevars 2023-04-20 22:35:54.000000000 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/Makevars 2023-09-03 20:16:54.000000000 +0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/Makevars 2023-09-08 21:10:30.000000000 +0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,12 +1,6 @@
</span> PKG_CPPFLAGS = -I"../inst/include" -D_GNU_SOURCE -DCONFIG_VERSION=\"2021-03-27\" -DSTRICT_R_HEADERS -DCONFIG_BIGNUM
PKG_CXXFLAGS = -DSTRICT_R_HEADERS
-PKG_LIBS = -L../inst/lib/$(R_ARCH)/ -lquickjs
<span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-ifeq ($(shell uname -p), powerpc)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ifeq ($(shell getconf LONG_BIT), 32)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- PKG_LIBS += -latomic
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-endif
</span> +PKG_LIBS = -L../inst/lib/$(R_ARCH)/ -lquickjs -latomic
QUICKJS_OBJECTS = quickjs/cutils.o quickjs/libbf.o quickjs/libregexp.o quickjs/libunicode.o \
</pre><pre style='margin:0'>
</pre>