From patchwork Sat Mar 2 10:06:54 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zheng Junjie X-Patchwork-Id: 61287 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 7EEB927BBEA; Sat, 2 Mar 2024 10:09:08 +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 autolearn=ham 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 85FCF27BBE2 for ; Sat, 2 Mar 2024 10:09:03 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rgMIF-0000Qw-Ly; Sat, 02 Mar 2024 05:08:35 -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 1rgMIE-0000QZ-Cv for guix-patches@gnu.org; Sat, 02 Mar 2024 05:08:34 -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 1rgMIE-0008B1-4V for guix-patches@gnu.org; Sat, 02 Mar 2024 05:08:34 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rgMIg-0005vf-C1 for guix-patches@gnu.org; Sat, 02 Mar 2024 05:09:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#69505] [PATCH 1/2] gnu: spdlog: Use Gexps. Resent-From: Zheng Junjie Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 02 Mar 2024 10:09:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 69505 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 69505@debbugs.gnu.org Received: via spool by 69505-submit@debbugs.gnu.org id=B69505.170937408422675 (code B ref 69505); Sat, 02 Mar 2024 10:09:02 +0000 Received: (at 69505) by debbugs.gnu.org; 2 Mar 2024 10:08:04 +0000 Received: from localhost ([127.0.0.1]:38073 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rgMHg-0005t8-7j for submit@debbugs.gnu.org; Sat, 02 Mar 2024 05:08:04 -0500 Received: from [159.226.251.81] (port=47154 helo=cstnet.cn) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rgMHQ-0005sH-LC for 69505@debbugs.gnu.org; Sat, 02 Mar 2024 05:07:52 -0500 Received: from localhost.localdomain (unknown [183.247.5.134]) by APP-03 (Coremail) with SMTP id rQCowABXOQI_+uJl66ftAw--.5470S2; Sat, 02 Mar 2024 18:06:57 +0800 (CST) From: Zheng Junjie Date: Sat, 2 Mar 2024 18:06:54 +0800 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-CM-TRANSID: rQCowABXOQI_+uJl66ftAw--.5470S2 X-Coremail-Antispam: 1UD129KBjvJXoW7JrW7uF4xWr4kAFWkXrykAFb_yoW8Jr1rpr WfCF1YkwnYqryFqa1vqF4jk39Iq39xGFWavw4fu3yrKw4UXF97AF48tan5uF4xAwnrCw47 WFyxWa13Ary5XrDanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUySb7Iv0xC_KF4lb4IE77IF4wAFF20E14v26r1j6r4UM7CY07I2 0VC2zVCF04k26cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M28lY4IEw2IIxxk0rw A2F7IY1VAKz4vEj48ve4kI8wA2z4x0Y4vE2Ix0cI8IcVAFwI0_Jr0_JF4l84ACjcxK6xII jxv20xvEc7CjxVAFwI0_Jr0_Gr1l84ACjcxK6I8E87Iv67AKxVW8Jr0_Cr1UM28EF7xvwV C2z280aVCY1x0267AKxVW8Jr0_Cr1UM2AIxVAIcxkEcVAq07x20xvEncxIr21l5I8CrVAC Y4xI64kE6c02F40Ex7xfMcIj6xIIjxv20xvE14v26r1j6r18McIj6I8E87Iv67AKxVWUJV W8JwAm72CE4IkC6x0Yz7v_Jr0_Gr1lF7xvr2IYc2Ij64vIr41l42xK82IYc2Ij64vIr41l 4I8I3I0E4IkC6x0Yz7v_Jr0_Gr1lx2IqxVAqx4xG67AKxVWUJVWUGwC20s026x8GjcxK67 AKxVWUGVWUWwC2zVAF1VAY17CE14v26r1j6r15MIIYrxkI7VAKI48JMIIF0xvE2Ix0cI8I cVAFwI0_Jr0_JF4lIxAIcVC0I7IYx2IY6xkF7I0E14v26r1j6r4UMIIF0xvE42xK8VAvwI 8IcIk0rVWUJVWUCwCI42IY6I8E87Iv67AKxVWUJVW8JwCI42IY6I8E87Iv6xkF7I0E14v2 6r1j6r4UYxBIdaVFxhVjvjDU0xZFpf9x07jOb18UUUUU= X-Originating-IP: [183.247.5.134] X-CM-SenderInfo: x2kh0wxmxqyx3h6l2u1dvotugofq/ 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: , 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/logging.scm (spdlog)[arguments]: Use Gexps. Change-Id: I53485d8adb450f7d0bfc2a2ed8ddee51142fd9a8 --- gnu/packages/logging.scm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/gnu/packages/logging.scm b/gnu/packages/logging.scm index 47e8cd39c2..afd602db42 100644 --- a/gnu/packages/logging.scm +++ b/gnu/packages/logging.scm @@ -26,6 +26,7 @@ (define-module (gnu packages logging) #:use-module ((guix licenses) #:prefix license:) + #:use-module (guix gexp) #:use-module (guix packages) #:use-module (guix utils) #:use-module (guix download) @@ -227,10 +228,10 @@ (define-public spdlog ;; TODO run benchmark. Currently not possible, as adding ;; (gnu packages benchmark) forms a dependency cycle (arguments - '(#:configure-flags - (list "-DSPDLOG_BUILD_BENCH=OFF" - "-DSPDLOG_BUILD_SHARED=ON" - "-DSPDLOG_BUILD_TESTS=ON"))) + (list #:configure-flags + #~(list "-DSPDLOG_BUILD_BENCH=OFF" + "-DSPDLOG_BUILD_SHARED=ON" + "-DSPDLOG_BUILD_TESTS=ON"))) (native-inputs (list catch2-3)) (home-page "https://github.com/gabime/spdlog") (synopsis "Fast C++ logging library") From patchwork Sat Mar 2 10:06:55 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zheng Junjie X-Patchwork-Id: 61285 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 9053E27BBEA; Sat, 2 Mar 2024 10:08:13 +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 autolearn=ham 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 8E9A627BBE2 for ; Sat, 2 Mar 2024 10:08:08 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rgMHX-0000Gq-CZ; Sat, 02 Mar 2024 05:07:52 -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 1rgMHG-0000Fy-Mq for guix-patches@gnu.org; Sat, 02 Mar 2024 05:07:34 -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 1rgMHG-0007Wv-B3 for guix-patches@gnu.org; Sat, 02 Mar 2024 05:07:34 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rgMHi-0005tM-9P for guix-patches@gnu.org; Sat, 02 Mar 2024 05:08:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#69505] [PATCH 2/2] gnu: spdlog: Fix cross-compilation. Resent-From: Zheng Junjie Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 02 Mar 2024 10:08:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 69505 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 69505@debbugs.gnu.org Received: via spool by 69505-submit@debbugs.gnu.org id=B69505.170937408022641 (code B ref 69505); Sat, 02 Mar 2024 10:08:02 +0000 Received: (at 69505) by debbugs.gnu.org; 2 Mar 2024 10:08:00 +0000 Received: from localhost ([127.0.0.1]:38071 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rgMHZ-0005sx-P0 for submit@debbugs.gnu.org; Sat, 02 Mar 2024 05:08:00 -0500 Received: from [159.226.251.81] (port=47156 helo=cstnet.cn) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rgMHQ-0005sG-Kx for 69505@debbugs.gnu.org; Sat, 02 Mar 2024 05:07:52 -0500 Received: from localhost.localdomain (unknown [183.247.5.134]) by APP-03 (Coremail) with SMTP id rQCowABXOQI_+uJl66ftAw--.5470S3; Sat, 02 Mar 2024 18:06:57 +0800 (CST) Date: Sat, 2 Mar 2024 18:06:55 +0800 Message-ID: <67bf93f49555cfe2b643920396e00664269e7f8c.1709372058.git.zhengjunjie@iscas.ac.cn> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-CM-TRANSID: rQCowABXOQI_+uJl66ftAw--.5470S3 X-Coremail-Antispam: 1UD129KBjvdXoW7JrW7uF47AF1rGr13GF4UArb_yoWfXrX_uF W7Grn7t39Y939Fk3s5ur1vg3s09a4xCFyftFW7Krn7Cr1rZw15Gr4q93yfJr47ta4akF1r ZF48Kr17Xry7ujkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUIcSsGvfJTRUUUb3AYjsxI4VW3JwAYFVCjjxCrM7AC8VAFwI0_Jr0_Gr1l1xkIjI8I 6I8E6xAIw20EY4v20xvaj40_Wr0E3s1l1IIY67AEw4v_Jr0_Jr4l82xGYIkIc2x26280x7 IE14v26r18M28IrcIa0xkI8VCY1x0267AKxVWUGwA2ocxC64kIII0Yj41l84x0c7CEw4AK 67xGY2AK021l84ACjcxK6xIIjxv20xvE14v26r1j6r1xM28EF7xvwVC0I7IYx2IY6xkF7I 0E14v26r1j6r4UM28EF7xvwVC2z280aVAFwI0_Gr1j6F4UJwA2z4x0Y4vEx4A2jsIEc7Cj xVAFwI0_Gr1j6F4UJwAS0I0E0xvYzxvE52x082IY62kv0487Mc02F40EFcxC0VAKzVAqx4 xG6I80ewAv7VC0I7IYx2IY67AKxVWUJVWUGwAv7VC2z280aVAFwI0_Jr0_Gr1lOx8S6xCa FVCjc4AY6r1j6r4UM4x0Y48IcxkI7VAKI48JMxAIw28IcxkI7VAKI48JMxC20s026xCaFV Cjc4AY6r1j6r4UMI8I3I0E5I8CrVAFwI0_Jr0_Jr4lx2IqxVCjr7xvwVAFwI0_JrI_JrWl x4CE17CEb7AF67AKxVWUJVWUXwCIc40Y0x0EwIxGrwCI42IY6xIIjxv20xvE14v26r1j6r 1xMIIF0xvE2Ix0cI8IcVCY1x0267AKxVWUJVW8JwCI42IY6xAIw20EY4v20xvaj40_Jr0_ JF4lIxAIcVC2z280aVAFwI0_Jr0_Gr1lIxAIcVC2z280aVCY1x0267AKxVWUJVW8JbIYCT nIWIevJa73UjIFyTuYvjxU4OJ5UUUUU X-Originating-IP: [183.247.5.134] X-CM-SenderInfo: x2kh0wxmxqyx3h6l2u1dvotugofq/ 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/logging.scm (spdlog)[arguments]<#:configure-flags>: when cross-compilation, don't add -DSPDLOG_BUILD_TESTS=ON. Change-Id: I90911c548c3f138ff40bff4b086f6102b717acf2 --- gnu/packages/logging.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gnu/packages/logging.scm b/gnu/packages/logging.scm index afd602db42..a757c22154 100644 --- a/gnu/packages/logging.scm +++ b/gnu/packages/logging.scm @@ -231,7 +231,9 @@ (define-public spdlog (list #:configure-flags #~(list "-DSPDLOG_BUILD_BENCH=OFF" "-DSPDLOG_BUILD_SHARED=ON" - "-DSPDLOG_BUILD_TESTS=ON"))) + #$@(if (%current-target-system) + '() + '("-DSPDLOG_BUILD_TESTS=ON"))))) (native-inputs (list catch2-3)) (home-page "https://github.com/gabime/spdlog") (synopsis "Fast C++ logging library")