From patchwork Sat Mar 9 08:27:57 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Zheng Junjie X-Patchwork-Id: 61573 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 0A19F27BBE2; Sat, 9 Mar 2024 10:26:56 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 5654827BBE9 for ; Sat, 9 Mar 2024 10:26:54 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rituf-0000aD-Kr; Sat, 09 Mar 2024 05:26:46 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rituQ-0000ZS-Lf for guix-patches@gnu.org; Sat, 09 Mar 2024 05:26:30 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rituQ-0005Tn-Dg for guix-patches@gnu.org; Sat, 09 Mar 2024 05:26:30 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rituw-0003Ox-Lq for guix-patches@gnu.org; Sat, 09 Mar 2024 05:27:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#69674] [PATCH] gnu: gperftools: Fix build on riscv64-linux. Resent-From: Zheng Junjie Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 09 Mar 2024 10:27:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 69674 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 69674@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.170998001313054 (code B ref -1); Sat, 09 Mar 2024 10:27:02 +0000 Received: (at submit) by debbugs.gnu.org; 9 Mar 2024 10:26:53 +0000 Received: from localhost ([127.0.0.1]:60739 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rituk-0003OO-5H for submit@debbugs.gnu.org; Sat, 09 Mar 2024 05:26:53 -0500 Received: from lists.gnu.org ([209.51.188.17]:60750) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ritue-0003OD-Pl for submit@debbugs.gnu.org; Sat, 09 Mar 2024 05:26:48 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ritu6-0000Xz-4e for guix-patches@gnu.org; Sat, 09 Mar 2024 05:26:10 -0500 Received: from [159.226.251.84] (helo=cstnet.cn) by eggs.gnu.org with esmtps (TLS1.2:DHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1rittz-0005FR-Op for guix-patches@gnu.org; Sat, 09 Mar 2024 05:26:09 -0500 Received: from m.taildaf0f.ts.net (unknown [183.247.5.134]) by APP-05 (Coremail) with SMTP id zQCowAAHIdCQHexlfeYVBQ--.8909S2; Sat, 09 Mar 2024 16:28:00 +0800 (CST) Date: Sat, 9 Mar 2024 16:27:57 +0800 Message-ID: <1e4ba5cb6a6dced1527cb14604c4bd59935ddec5.1709972877.git.zhengjunjie@iscas.ac.cn> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 X-CM-TRANSID: zQCowAAHIdCQHexlfeYVBQ--.8909S2 X-Coremail-Antispam: 1UD129KBjDUn29KB7ZKAUJUUUUU529EdanIXcx71UUUUU7v73 VFW2AGmfu7bjvjm3AaLaJ3UjIYCTnIWjp_UUUYh7k0a2IF6F4UM7kC6x804xWl14x267AK xVWUJVW8JwAFc2x0x2IEx4CE42xK8VAvwI8IcIk0rVWrJVCq3wAFIxvE14AKwVWUJVWUGw A2ocxC64kIII0Yj41l84x0c7CEw4AK67xGY2AK021l84ACjcxK6xIIjxv20xvE14v26r1j 6r1xM28EF7xvwVC0I7IYx2IY6xkF7I0E14v26r1j6r4UM28EF7xvwVC2z280aVAFwI0_Gr 1j6F4UJwA2z4x0Y4vEx4A2jsIEc7CjxVAFwI0_Gr1j6F4UJwAS0I0E0xvYzxvE52x082IY 62kv0487M2AExVAIFx02aVAFz4v204v7Mc02F40EFcxC0VAKzVAqx4xG6I80ewAv7VC0I7 IYx2IY67AKxVWUGVWUXwAv7VC2z280aVAFwI0_Jr0_Gr1lOx8S6xCaFVCjc4AY6r1j6r4U M4x0Y48IcxkI7VAKI48JM4kE6I8I3I0E14AKx2xKxVC2ax8xMxAIw28IcxkI7VAKI48JMx C20s026xCaFVCjc4AY6r1j6r4UMI8I3I0E5I8CrVAFwI0_Jr0_Jr4lx2IqxVCjr7xvwVAF wI0_Jr0_Jr4lx4CE17CEb7AF67AKxVWUJVWUXwCIc40Y0x0EwIxGrwCI42IY6xIIjxv20x vE14v26r1j6r1xMIIF0xvE2Ix0cI8IcVCY1x0267AKxVWUJVW8JwCI42IY6xAIw20EY4v2 0xvaj40_Jr0_JF4lIxAIcVC2z280aVAFwI0_Jr0_Gr1lIxAIcVC2z280aVCY1x0267AKxV WUJVW8JbIYCTnIWIevJa73UjIFyTuYvjxU7LZ2DUUUU X-Originating-IP: [183.247.5.134] X-CM-SenderInfo: x2kh0wxmxqyx3h6l2u1dvotugofq/ X-Host-Lookup-Failed: Reverse DNS lookup failed for 159.226.251.84 (deferred) Received-SPF: pass client-ip=159.226.251.84; envelope-from=zhengjunjie@iscas.ac.cn; helo=cstnet.cn X-Spam_score_int: -10 X-Spam_score: -1.1 X-Spam_bar: - X-Spam_report: (-1.1 / 5.0 requ) BAYES_00=-1.9, RDNS_NONE=0.793, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Zheng Junjie via Guix-patches From: Zheng Junjie Reply-To: Zheng Junjie Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/cpp.scm(gperftools)[arguments]: When building for riscv64-linux always link with libatomic. Change-Id: I067087fffd8c142759b6d113f993c3e2ab1aef9b --- gnu/packages/cpp.scm | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) base-commit: a10cce5246e333be52acd7d334f59228895db89a prerequisite-patch-id: 5a904c413bc4e5484fed86ec8a7862b20ef3156e prerequisite-patch-id: a70182b0cf360548e7a3ae659e40c58ee3ddad71 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 ;;; Copyright © 2022 Arun Isaac ;;; Copyright © 2022, 2023, 2024 David Elsing -;;; Copyright © 2022, 2023 Zheng Junjie <873216071@qq.com> +;;; Copyright © 2022-2024 Zheng Junjie <873216071@qq.com> ;;; Copyright © 2022, 2023, 2024 Maxim Cournoyer ;;; Copyright © 2022 Antero Mejr ;;; Copyright © 2023 Sughosha @@ -907,9 +907,12 @@ (define-public gperftools (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.