GNU bug report logs - #64673
[PATCH 0/3] fix quickjs building on riscv64-linux, use gexp, honor #:tests? flags .

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 64673 in the body.
You can then email your comments to 64673 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Zheng Junjie <873216071 <at> qq.com>
To: guix-patches <at> gnu.org
Subject: [PATCH 0/3] fix quickjs building on riscv64-linux, use gexp,
 honor #:tests? flags .
Date: Mon, 17 Jul 2023 12:07:29 +0800

*** BLURB HERE ***

Zheng Junjie (3):
  gnu: quickjs: Fix building on riscv64-linux.
  gnu: quickjs: Use G-expressions.
  gnu: quickjs: Honor the #:tests? flag.

 gnu/packages/javascript.scm | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)


base-commit: 3755941f038ec66fba568fa88d6b2d295e196723
-- 
2.41.0

Message #8 received at 64673 <at> debbugs.gnu.org (full text, mbox):

From: Zheng Junjie <873216071 <at> qq.com>
To: 64673 <at> debbugs.gnu.org
Subject: [PATCH 1/3] gnu: quickjs: Fix building on riscv64-linux.
Date: Mon, 17 Jul 2023 12:10:55 +0800

* 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 <at> ambrevar.xyz>
 ;;; Copyright © 2021 Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
 ;;; Copyright © 2022 Frank Pursel <frank.pursel <at> gmail.com>
+;;; Copyright © 2023 Zheng Junjie <873216071 <at> 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

Message #11 received at 64673 <at> debbugs.gnu.org (full text, mbox):

From: Zheng Junjie <873216071 <at> qq.com>
To: 64673 <at> debbugs.gnu.org
Subject: [PATCH 2/3] gnu: quickjs: Use G-expressions.
Date: Mon, 17 Jul 2023 12:10:56 +0800

* 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

Message #14 received at 64673 <at> debbugs.gnu.org (full text, mbox):

From: Zheng Junjie <873216071 <at> qq.com>
To: 64673 <at> debbugs.gnu.org
Subject: [PATCH 3/3] gnu: quickjs: Honor the #:tests? flag.
Date: Mon, 17 Jul 2023 12:10:57 +0800

* 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

Message #19 received at 64673-done <at> debbugs.gnu.org (full text, mbox):

From: 宋文武 <iyzsong <at> envs.net>
To: Zheng Junjie <873216071 <at> qq.com>
Cc: 64673-done <at> debbugs.gnu.org
Subject: Re: [bug#64673] [PATCH 0/3] fix quickjs building on riscv64-linux,
 use gexp, honor #:tests? flags .
Date: Tue, 19 Mar 2024 19:16:12 +0800

Zheng Junjie <873216071 <at> qq.com> writes:

> *** BLURB HERE ***
>
> Zheng Junjie (3):
>   gnu: quickjs: Fix building on riscv64-linux.
>   gnu: quickjs: Use G-expressions.
>   gnu: quickjs: Honor the #:tests? flag.
>
>  gnu/packages/javascript.scm | 20 +++++++++++---------
>  1 file changed, 11 insertions(+), 9 deletions(-)
>
>
> base-commit: 3755941f038ec66fba568fa88d6b2d295e196723

Pushed, thank you!

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.