From patchwork Tue Apr 22 19:26:24 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Hogan X-Patchwork-Id: 41947 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 7201427BC49; Tue, 22 Apr 2025 20:27:19 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED 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 63EE127BC4B for ; Tue, 22 Apr 2025 20:27:18 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u7JGs-00021z-Pt; Tue, 22 Apr 2025 15:27:06 -0400 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 1u7JGq-0001yc-2f for guix-patches@gnu.org; Tue, 22 Apr 2025 15:27:04 -0400 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 1u7JGp-0005vY-PI for guix-patches@gnu.org; Tue, 22 Apr 2025 15:27:03 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=QY17zMdzDAo3nnDI7t/W5HWRxlX6VWFpeqOkSV0X9p8=; b=Hw9rNoRkJ5Eq9fu/kktY/NoKdMnsGLnJrvjPNaeXtYgQmmI0kp3+/o734Qg8Pv439Yat0FZFdsC1trj+tGvdzjhdFkTucCvss3BeFBOsJeKZq81TJ2RKiT9EBwEGhZjnlzQaQuL/Vvue2UbHZng+33FnLsmzloeJSTaU4WyAzUGUbIsjb/7JmA/j7cb/DdYNfMJRu/J0PHy9Bo0QFjnPd40bIDkXbvJkf4Jhg9NOdmqCUJJeR6pylihPewGuD4h5QpW+VpkL95eKaSX2vNte+hY7PB5jZ1sgf+rGWphmB8M6kzDLKulSL7zmEJvOH/eW02MFjUus2VHtbU9BJcDgQA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1u7JGp-000441-KL; Tue, 22 Apr 2025 15:27:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#77406] [PATCH sysadmin-team v2 2/2] gnu: spdlog: Include benchmarks. Resent-From: Greg Hogan Original-Sender: "Debbugs-submit" Resent-CC: sharlatanus@gmail.com, guix-patches@gnu.org Resent-Date: Tue, 22 Apr 2025 19:27:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 77406 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 77406@debbugs.gnu.org Cc: Greg Hogan , Sharlatan Hellseher X-Debbugs-Original-Xcc: Sharlatan Hellseher Received: via spool by 77406-submit@debbugs.gnu.org id=B77406.174535001715588 (code B ref 77406); Tue, 22 Apr 2025 19:27:03 +0000 Received: (at 77406) by debbugs.gnu.org; 22 Apr 2025 19:26:57 +0000 Received: from localhost ([127.0.0.1]:49959 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1u7JGj-00043H-Az for submit@debbugs.gnu.org; Tue, 22 Apr 2025 15:26:57 -0400 Received: from mail-qk1-x72c.google.com ([2607:f8b0:4864:20::72c]:58505) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1u7JGf-00042d-9x for 77406@debbugs.gnu.org; Tue, 22 Apr 2025 15:26:53 -0400 Received: by mail-qk1-x72c.google.com with SMTP id af79cd13be357-7c922169051so233308685a.0 for <77406@debbugs.gnu.org>; Tue, 22 Apr 2025 12:26:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=greghogan-com.20230601.gappssmtp.com; s=20230601; t=1745350007; x=1745954807; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=QY17zMdzDAo3nnDI7t/W5HWRxlX6VWFpeqOkSV0X9p8=; b=1AlYOrOYWLhdloBRz6VMo+Hqp3WD2y8QADtRK4MCPn/epzmzhGs9Ov0phVNUMNk77W waf0xrlKjRQDaH7BIM1a48r9EWbRIP0BB+ZW7/JjRUwWMSMxittP5ztMawNQISvR0fXK 8plaMIXXTFkZraOZ8fH/7jFMo+btiEpiroTOqMNP1EbTrZU1gzOcWvTSUMe9KEbJ12O1 j86s+ONh1AIEr0olsuA8axchNYOwu+6fe4jRlyEikZOqtMVbxDakEDJNLWYTB4W4mZ47 p3M6zsyPW7ifm5X5Pmc+SEjJglfFlMjJX27bpElXhzsI/WxkB7UvG7wcjaDby5h1S30l KQwQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745350007; x=1745954807; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=QY17zMdzDAo3nnDI7t/W5HWRxlX6VWFpeqOkSV0X9p8=; b=fLE6O0m0UxjadFz+/y1lhf+edR+3h1E4VAZZsMJMUXB4kCcZ+z8Vy/AG51Mrec+xcv 5o3PHQwy0IxhZR2V4W0SfoTiFl0dtMaUFqbz6tyAwo37wJyZFj7fIFJnqR5+1hm19kmm eGXA6tSoMqtZEQlw6xAV4JAiadixL6uCKHrhbby43HlldXDOEkzzM2NzTBkLscoh8kkR wtvULS615QHG/77jYQUneEfYs5pV7ufx19I3by2DnLgzGpwHx2T4PwFUF5895dr7J5+/ q2Z78BNysydUJ3SW4hrnzh6l5lO+FTtQQDVFn6rYfXa6XYIWiBhWea/p84Kvgwp9NvUM Ad+A== X-Gm-Message-State: AOJu0YxASlEzmpmFL8zgbaztUg6HuJcDoVNhUNAXoRrnxCEYg/Ukp8p6 mr2GWmg13+L+kX4zOirpYMsh/r081JKCCoRBZktOy7rl6TISx6ONGHxYQilbFZPv4+6OEgQbzpz 6 X-Gm-Gg: ASbGnctSL2sa9bmooQy1xbWbdu0rc0SYVCWfraGitPIxw/rVUW8mr8M3IvgGHIaC0fs /r6MeAKH0DrRvB7Swc6QRE2hjyE43B3CoPXKiCPuOYfOOjV2o+WOjxDiLRkYFJkjS8S+LHvBLqc Sdl8TKVQF7Y8POMzmTh8F4CvZq5OUs6k7Pk0RWsdrmKC7RlN2F4Mx2ESCn2iKKb1r69TqupSK7H xLU/sAq99vvlM9yBg+w9cmm6eJju6yLybVaJRoi4JuHfi0KpnwlkKzCkVuR+zexiAuLbj8PdOUO JlTYwA5X9iua9yhHVL+lUPAC3v1fKC8sOcBX5uq7z1accb7LUEx2zfwgMDXlG/O1sCPSIu/x/sF XMU61TqdfYEHidF6ymZiS0x8vwwiwW3oCfUYoYluT X-Google-Smtp-Source: AGHT+IEp3il9RPJf7kJY4qOomYSWlYjyX7k5D9DjGlD/9bGHXyxLh0NQTnQNUwEyXJPg3vR+hfMMmA== X-Received: by 2002:a05:6214:c2f:b0:6ea:d604:9e49 with SMTP id 6a1803df08f44-6f2c464071amr320621236d6.34.1745350007439; Tue, 22 Apr 2025 12:26:47 -0700 (PDT) Received: from ip-10-117-149-49.evoforge.org (ec2-52-70-167-183.compute-1.amazonaws.com. [52.70.167.183]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-6f2c2c21c32sm61333366d6.110.2025.04.22.12.26.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Apr 2025 12:26:47 -0700 (PDT) From: Greg Hogan Date: Tue, 22 Apr 2025 19:26:24 +0000 Message-ID: <8028e4710c05db38175d5298c036b05e47c1fbf8.1745349639.git.code@greghogan.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: References: MIME-Version: 1.0 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)[outputs]: Add "bin". [arguments]<#:configure-flags>: Enable benchmark builds. <#:phases>: Add 'patch phase to insert install commands. [inputs]: Add googlebenchmark. Change-Id: Ia0494c1efffb13bcb5dcd470372cf5427f003857 --- gnu/packages/logging.scm | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/gnu/packages/logging.scm b/gnu/packages/logging.scm index 7425cd2740..8c5e517f21 100644 --- a/gnu/packages/logging.scm +++ b/gnu/packages/logging.scm @@ -250,16 +250,29 @@ (define-public spdlog (sha256 (base32 "0n6i8d5aycvp9n2zz2rz67s1y19cw9m5j3pk4719d3a5czh4267m")))) (build-system cmake-build-system) - ;; TODO run benchmark. Currently not possible, as adding - ;; (gnu packages benchmark) forms a dependency cycle + (outputs '("out" "bin")) (arguments (list #:configure-flags - #~(list "-DSPDLOG_BUILD_BENCH=OFF" + #~(list "-DSPDLOG_BUILD_BENCH=ON" "-DSPDLOG_BUILD_SHARED=ON" #$@(if (%current-target-system) '() - '("-DSPDLOG_BUILD_TESTS=ON"))))) + '("-DSPDLOG_BUILD_TESTS=ON"))) + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch + (lambda _ + (substitute* "bench/CMakeLists.txt" + ;; Add install command for each benchmark program. + (("add_executable\\(([^ ]+) .*$" all target) + (string-append all + "install(TARGETS " + target + " DESTINATION " + #$output:bin "/bin" + ")\n")))))))) (native-inputs (list catch2-3)) + (inputs (list googlebenchmark)) (home-page "https://github.com/gabime/spdlog") (synopsis "Fast C++ logging library") (description "Spdlog is a very fast header-only/compiled C++ logging