From patchwork Tue Jul 18 14:40:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 51827 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 E706C27BBEA; Tue, 18 Jul 2023 15:44:38 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,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 7065527BBE2 for ; Tue, 18 Jul 2023 15:44:38 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qLltx-0007fl-3B; Tue, 18 Jul 2023 10:42:09 -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 1qLltu-0007co-Vc for guix-patches@gnu.org; Tue, 18 Jul 2023 10:42:07 -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 1qLltu-0000v2-Ml for guix-patches@gnu.org; Tue, 18 Jul 2023 10:42:06 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qLltu-0006dy-JK for guix-patches@gnu.org; Tue, 18 Jul 2023 10:42:06 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64711] [PATCH 17/43] gnu: libgcrypt: Skip hanging benchmark tests on the Hurd. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 18 Jul 2023 14:42:06 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64711 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64711@debbugs.gnu.org Received: via spool by 64711-submit@debbugs.gnu.org id=B64711.168969128425281 (code B ref 64711); Tue, 18 Jul 2023 14:42:06 +0000 Received: (at 64711) by debbugs.gnu.org; 18 Jul 2023 14:41:24 +0000 Received: from localhost ([127.0.0.1]:53780 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qLltD-0006Zc-Qh for submit@debbugs.gnu.org; Tue, 18 Jul 2023 10:41:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39942) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qLltA-0006Z2-AA for 64711@debbugs.gnu.org; Tue, 18 Jul 2023 10:41:20 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qLlt5-0000fu-2t; Tue, 18 Jul 2023 10:41:15 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=PY5bwWjqMMa/Mw45VN6jCrlAwBzcouuo/8mbU4Jzvq8=; b=dcRgQ7lTevMC4jN1iI/G Q4ec+cJJyqhL/vWixar/M5vPd3YLEW9WqeyA8dAYs602apC3E/jldrmzGlMd/xWDV5xhp5McYo9Ij lXxpQa6Pg8Yd4PUePErrQ6xRrZnya7fHYgB4Gf7HeXIpSClCAiqSIWHLVd34ely0+I4pcdIc8WCqC n8WbbogrfiuQ44e2gIAdn41mrE3gnkySvaEkBekpX/SUBbJ5MqyWlN/gLbKxD1ZmhnQ7DQRIBbig0 MvW5iwY44b4SlYIT2D4xAM7Hort1r6RVyOtQ028eF2ASdcI9WZpbWIERfaJ14z8RZNSAI7INTGAZe qUCtdes8i5TlUg==; Received: from 2a02-a462-da03-1-aeb0-2f5e-e96a-dccb.fixed6.kpn.net ([2a02:a462:da03:1:aeb0:2f5e:e96a:dccb] helo=drakenpad.fritz.box) by fencepost.gnu.org with esmtpa (Exim 4.90_1) (envelope-from ) id 1qLlsz-0004hp-Kh; Tue, 18 Jul 2023 10:41:14 -0400 From: Janneke Nieuwenhuizen Date: Tue, 18 Jul 2023 16:40:10 +0200 Message-Id: <6d5f627b409a5d4dc7ddc19cd22957685eb2d07f.1689690897.git.janneke@gnu.org> X-Mailer: git-send-email 2.40.1 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/gnupg.scm (libgcrypt)[arguments]: When building natively on the Hurd, add phase 'setenv' to set "GCRYPT_NO_BENCHMARKS". --- gnu/packages/gnupg.scm | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm index 4a9a8fbb57..8d92c60bf2 100644 --- a/gnu/packages/gnupg.scm +++ b/gnu/packages/gnupg.scm @@ -204,7 +204,15 @@ (define-public libgcrypt ,@(if (%current-target-system) ;; When cross-compiling, _gcry_mpih_lshift etc are undefined. `("--disable-asm") - '())))) + '())) + ,@(if (system-hurd?) + (list + #:phases + #~(modify-phases %standard-phases + (add-before 'configure 'setenv + (lambda _ + (setenv "GCRYPT_NO_BENCHMARKS" "t"))))) + '()))) (outputs '("out" "debug")) (home-page "https://gnupg.org/") (synopsis "Cryptographic function library")