guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

02/02: gnu: gperftools: Fix build on riscv64-linux.


From: guix-commits
Subject: 02/02: gnu: gperftools: Fix build on riscv64-linux.
Date: Sat, 9 Mar 2024 22:07:34 -0500 (EST)

iyzsong pushed a commit to branch master
in repository guix.

commit b05bb6608c7f25ddce6b563194ba5a3007009282
Author: Zheng Junjie <zhengjunjie@iscas.ac.cn>
AuthorDate: Sat Mar 9 16:27:57 2024 +0800

    gnu: gperftools: Fix build on riscv64-linux.
    
    * gnu/packages/cpp.scm(gperftools)[arguments]: When building for 
riscv64-linux
    always link with libatomic.
    
    Change-Id: I067087fffd8c142759b6d113f993c3e2ab1aef9b
    Signed-off-by: 宋文武 <iyzsong@member.fsf.org>
---
 gnu/packages/cpp.scm | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm
index 3b65ce9f4a..d451eea2fd 100644
--- a/gnu/packages/cpp.scm
+++ b/gnu/packages/cpp.scm
@@ -30,7 +30,7 @@
 ;;; Copyright © 2022 Attila Lendvai <attila@lendvai.name>
 ;;; Copyright © 2022 Arun Isaac <arunisaac@systemreboot.net>
 ;;; Copyright © 2022, 2023, 2024 David Elsing <david.elsing@posteo.net>
-;;; Copyright © 2022, 2023 Zheng Junjie <873216071@qq.com>
+;;; Copyright © 2022-2024 Zheng Junjie <873216071@qq.com>
 ;;; Copyright © 2022, 2023, 2024 Maxim Cournoyer <maxim.cournoyer@gmail.com>
 ;;; Copyright © 2022 Antero Mejr <antero@mailbox.org>
 ;;; Copyright © 2023 Sughosha <Sughosha@proton.me>
@@ -907,9 +907,12 @@ lock-free fixed size queue written in C++11.")
        (file-name (git-file-name name version))))
     (build-system gnu-build-system)
     (arguments
-      ;; The tests are flaky when run in parallel. For more info:
-      ;; https://bugs.gnu.org/46562
-     '(#:parallel-tests? #f))
+     ;; The tests are flaky when run in parallel. For more info:
+     ;; https://bugs.gnu.org/46562
+     `(#:parallel-tests? #f
+       ,@(if (target-riscv64?)
+             `(#:make-flags (list "LDFLAGS=-latomic"))
+             '())))
     (native-inputs
      (list autoconf automake libtool
            ;; For tests.



reply via email to

[Prev in Thread] Current Thread [Next in Thread]