<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/9532782b1081c7a4457e968880386f2c92021534">https://github.com/macports/macports-ports/commit/9532782b1081c7a4457e968880386f2c92021534</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 9532782b1081c7a4457e968880386f2c92021534
</span>Author: barracuda156 <vital.had@gmail.com>
AuthorDate: Sat Jun 1 18:13:24 2024 +0800
<span style='display:block; white-space:pre;color:#404040;'> R-QuickJSR: update to 1.2.0
</span>---
R/R-QuickJSR/Portfile | 20 ++++++--------------
R/R-QuickJSR/files/patch-legacy.diff | 15 ++++++++-------
R/R-QuickJSR/files/patch-libatomic.diff | 25 +++++++++++++------------
R/R-QuickJSR/files/patch-no-libatomic.diff | 13 -------------
4 files changed, 27 insertions(+), 46 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 26d5a2406ec..1acf86ea151 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;'>@@ -6,21 +6,17 @@ PortGroup R 1.0
</span>
legacysupport.newest_darwin_requires_legacy 15
<span style='display:block; white-space:pre;background:#ffe0e0;'>-R.setup cran andrjohns QuickJSR 1.1.3
</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.2.0
</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}
homepage https://github.com/andrjohns/QuickJSR
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 ac3890ac435362ea76e7530bfb356391b1064461 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 ed2dd1c5f3e36eaebb95d9c015470672ce1219ac804944accb8a42297a3b9731 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 628415
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib-append port:R-jsonlite \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:R-R6 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:R-Rcpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 fe68d24ef4e2b1ddf3f4ec02cac58b5d96a65980 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 0efa01d4312148d8553847fe7f0a87bfba1520d2fef34d7504f66890f527d6e6 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 653519
</span>
# Native ppc build has been fixed in: https://github.com/andrjohns/QuickJSR/commit/07fb3893d29fa17658a8cb8b17ffd2aba4453280
# See: https://github.com/andrjohns/QuickJSR/issues/1
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -30,10 +26,6 @@ depends_lib-append port:R-jsonlite \
</span> if {[string match macports-gcc* ${configure.compiler}] && (${configure.build_arch} in [list i386 ppc])} {
patchfiles-append \
patch-libatomic.diff
<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;'>- # https://trac.macports.org/ticket/69872
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-no-libatomic.diff
</span> }
# https://trac.macports.org/ticket/68152
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -45,6 +37,6 @@ if {${os.platform} eq "darwin" && ${os.major} < 16} {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_test-append port:R-testthat
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_test-append port:R-tinytest
</span>
test.run yes
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/R/R-QuickJSR/files/patch-legacy.diff b/R/R-QuickJSR/files/patch-legacy.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index f4dfcc0f0b1..2c1dabe4ccc 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/R/R-QuickJSR/files/patch-legacy.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/R/R-QuickJSR/files/patch-legacy.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +1,12 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/Makevars 2024-01-22 13:31:51.000000000 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/Makevars 2024-01-22 13:31:41.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:#ffe0e0;'>--PKG_CPPFLAGS = -I"../inst/include/" -DSTRICT_R_HEADERS -D_GNU_SOURCE -DCONFIG_BIGNUM
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+PKG_CPPFLAGS = -I"../inst/include/" -I@PREFIX@/include/LegacySupport -DSTRICT_R_HEADERS -D_GNU_SOURCE -DCONFIG_BIGNUM
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/Makevars 2024-05-31 02:47:55.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/Makevars 2024-06-01 18:04:16.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,7 +1,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-PKG_CPPFLAGS = -I"../inst/include/" -I"../inst/include/quickjs"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++PKG_CPPFLAGS = -I"../inst/include/" -I"../inst/include/quickjs" -I@PREFIX@/include/LegacySupport
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PKG_CPPFLAGS += -D_GNU_SOURCE -DCONFIG_BIGNUM
</span> PKG_CPPFLAGS += -DCONFIG_VERSION=\"$(shell cat quickjs/VERSION)\"
-PKG_LIBS = ../inst/lib/$(R_ARCH)/libquickjs.a
+PKG_LIBS = ../inst/lib/$(R_ARCH)/libquickjs.a -L@PREFIX@/lib -lMacportsLegacySupport
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ifeq ($(shell getconf LONG_BIT), 32)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PKG_LIBS += -latomic
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ifeq ($(OS),Windows_NT)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DLL := .dll
</span><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 589a0f64280..e0f52cba2ad 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,13 +1,14 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/Makevars 2023-11-24 22:54:10.000000000 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/Makevars 2023-12-10 17:25:13.000000000 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,9 +1,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PKG_CPPFLAGS = -I"../inst/include" -DSTRICT_R_HEADERS -D_GNU_SOURCE -DCONFIG_VERSION=\"2021-03-27\" -DCONFIG_BIGNUM
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PKG_LIBS = ../inst/lib/$(R_ARCH)/libquickjs.a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/Makevars 2024-05-31 02:47:55.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/Makevars 2024-06-01 18:08:54.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -31,9 +31,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PKG_CPPFLAGS += -DDISABLE_ATOMICS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Explicit -latomic is needed for 32-bit builds only on GCC
</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;'>++# However we still need -latomic when building for 32-bit on 64-bit with GCC
</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>
<span style='display:block; white-space:pre;background:#ffe0e0;'>--ifeq ($(shell getconf LONG_BIT), 32)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- PKG_LIBS += -latomic
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+PKG_LIBS += -latomic
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- QUICKJS_SOURCES = $(wildcard quickjs/*.c)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- QUICKJS_OBJECTS = $(QUICKJS_SOURCES:.c=.o)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/R/R-QuickJSR/files/patch-no-libatomic.diff b/R/R-QuickJSR/files/patch-no-libatomic.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 124d8688fc9..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/R/R-QuickJSR/files/patch-no-libatomic.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,13 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/Makevars 2024-01-31 17:42:22.000000000 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/Makevars 2024-05-05 05:32:22.000000000 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2,10 +2,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PKG_CPPFLAGS += -DCONFIG_VERSION=\"$(shell cat quickjs/VERSION)\"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PKG_LIBS = ../inst/lib/$(R_ARCH)/libquickjs.a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--ifeq ($(shell getconf LONG_BIT), 32)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- PKG_LIBS += -latomic
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Older versions of gcc and clang don't provide the stdatomic.h header
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CC_CHECK := $(shell $(CC) --version 2>&1)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CC_VERSION := $(shell $(CC) -dumpfullversion -dumpversion 2>&1)
</span></pre><pre style='margin:0'>
</pre>