[bug#64673] [PATCH 1/3] gnu: quickjs: Fix building on riscv64-linux.

[bug#64673] [PATCH 1/3] gnu: quickjs: Fix building on riscv64-linux.

[Zheng Junjie via Guix-patches via]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset=y, Size: 1069 bytes --]

* gnu/packages/javascript.scm (quickjs)[arguments]: Adjust
make-flags when building for riscv64-linux to link with '-latomic'.
---
 gnu/packages/javascript.scm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/javascript.scm b/gnu/packages/javascript.scm
index e70aa7d7e1..ca467bee65 100644
--- a/gnu/packages/javascript.scm
+++ b/gnu/packages/javascript.scm
@@ -7,6 +7,7 @@
 ;;; Copyright © 2021 Pierre Neidhardt <mail@ambrevar.xyz>
 ;;; Copyright © 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
 ;;; Copyright © 2022 Frank Pursel <frank.pursel@gmail.com>
+;;; Copyright © 2023 Zheng Junjie <873216071@qq.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -822,7 +823,8 @@ (define-public quickjs
     (arguments
      `(#:make-flags
        (list "prefix="
-             (string-append "DESTDIR=" %output))
+             (string-append "DESTDIR=" %output)
+             ,@(if (target-riscv64?) '("LDFLAGS=-latomic") '()))
        #:phases
        (modify-phases %standard-phases
          (delete 'configure)
-- 
2.41.0

[bug#64673] [PATCH 2/3] gnu: quickjs: Use G-expressions.

[Zheng Junjie via Guix-patches via]

* gnu/packages/javascript.scm (quickjs)[arguments]:
Rewrite as G-expressions.
---
 gnu/packages/javascript.scm | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/gnu/packages/javascript.scm b/gnu/packages/javascript.scm
index ca467bee65..b9ee5a93b3 100644
--- a/gnu/packages/javascript.scm
+++ b/gnu/packages/javascript.scm
@@ -821,16 +821,15 @@ (define-public quickjs
                 "06pywwpmfwjz225h59wf90q96a2fd66qfcw5xa6m6y9k9k7glnx4"))))
     (build-system gnu-build-system)
     (arguments
-     `(#:make-flags
-       (list "prefix="
-             (string-append "DESTDIR=" %output)
-             ,@(if (target-riscv64?) '("LDFLAGS=-latomic") '()))
-       #:phases
-       (modify-phases %standard-phases
-         (delete 'configure)
-         (replace 'check
-           (lambda _
-             (invoke "make" "microbench"))))))
+     (list #:make-flags
+           #~(list "prefix="
+                   (string-append "DESTDIR=" #$output)
+                   #$@(if (target-riscv64?) '("LDFLAGS=-latomic") '()))
+           #:phases #~(modify-phases %standard-phases
+                        (delete 'configure)
+                        (replace 'check
+                          (lambda _
+                            (invoke "make" "microbench"))))))
     (home-page "https://bellard.org/quickjs/")
     (synopsis "Small embeddable Javascript engine")
     (description "QuickJS supports the ES2020 specification including modules,
-- 
2.41.0

[bug#64673] [PATCH 3/3] gnu: quickjs: Honor the #:tests? flag.

[Zheng Junjie via Guix-patches via]

* gnu/packages/javascript.scm (quickjs)[arguments]: Adjust custom
'check phase to honor the #:tests? flag.
---
 gnu/packages/javascript.scm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/javascript.scm b/gnu/packages/javascript.scm
index b9ee5a93b3..1c37f73d75 100644
--- a/gnu/packages/javascript.scm
+++ b/gnu/packages/javascript.scm
@@ -828,8 +828,9 @@ (define-public quickjs
            #:phases #~(modify-phases %standard-phases
                         (delete 'configure)
                         (replace 'check
-                          (lambda _
-                            (invoke "make" "microbench"))))))
+                          (lambda* (#:key tests? #:allow-other-keys)
+                            (when tests?
+                              (invoke "make" "microbench")))))))
     (home-page "https://bellard.org/quickjs/")
     (synopsis "Small embeddable Javascript engine")
     (description "QuickJS supports the ES2020 specification including modules,
-- 
2.41.0