From 3c46191abd0ab1e6cf24ddfedafbd9b646989f5c Mon Sep 17 00:00:00 2001 From: Zheng Junjie <873216071@qq.com> Date: Mon, 17 Jul 2023 12:10:55 +0800 Subject: gnu: quickjs: Fix building on riscv64-linux. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/javascript.scm (quickjs)[arguments]: Adjust make-flags when building for riscv64-linux to link with '-latomic'. Signed-off-by: 宋文武 Change-Id: Ic66874191985c877f5fb648b37e241bff3f16084 --- gnu/packages/javascript.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'gnu/packages/javascript.scm') diff --git a/gnu/packages/javascript.scm b/gnu/packages/javascript.scm index 84d12f6b13..3ec1e5c5a5 100644 --- a/gnu/packages/javascript.scm +++ b/gnu/packages/javascript.scm @@ -7,6 +7,7 @@ ;;; Copyright © 2021 Pierre Neidhardt ;;; Copyright © 2021 Maxim Cournoyer ;;; Copyright © 2022 Frank Pursel +;;; Copyright © 2023 Zheng Junjie <873216071@qq.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -837,7 +838,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) -- cgit v1.2.3 From efad468f6d51133c967205c8b9fb8e52a8bfd05e Mon Sep 17 00:00:00 2001 From: Zheng Junjie <873216071@qq.com> Date: Mon, 17 Jul 2023 12:10:56 +0800 Subject: gnu: quickjs: Use G-expressions. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/javascript.scm (quickjs)[arguments]: Rewrite as G-expressions. Signed-off-by: 宋文武 Change-Id: Ib6b47266a7faf020831653ce205b442f3af35de2 --- gnu/packages/javascript.scm | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) (limited to 'gnu/packages/javascript.scm') diff --git a/gnu/packages/javascript.scm b/gnu/packages/javascript.scm index 3ec1e5c5a5..a1c0d9ad01 100644 --- a/gnu/packages/javascript.scm +++ b/gnu/packages/javascript.scm @@ -836,16 +836,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, -- cgit v1.2.3 From 8a4ed004d6b0720f47fc6ef5f0247a66a42a2f7c Mon Sep 17 00:00:00 2001 From: Zheng Junjie <873216071@qq.com> Date: Mon, 17 Jul 2023 12:10:57 +0800 Subject: gnu: quickjs: Honor the #:tests? flag. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/javascript.scm (quickjs)[arguments]: Adjust custom 'check phase to honor the #:tests? flag. Signed-off-by: 宋文武 Change-Id: I686b3b9a615cbdaefaf59d9c1c0ba7628d7d92f2 --- gnu/packages/javascript.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu/packages/javascript.scm') diff --git a/gnu/packages/javascript.scm b/gnu/packages/javascript.scm index a1c0d9ad01..c6e7443f85 100644 --- a/gnu/packages/javascript.scm +++ b/gnu/packages/javascript.scm @@ -843,8 +843,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, -- cgit v1.2.3