From patchwork Wed Oct 30 14:30:30 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 69633 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 AB51C27BBE9; Wed, 30 Oct 2024 14:34:34 +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=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,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=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 DE18427BBE2 for ; Wed, 30 Oct 2024 14:34:32 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t69ls-0002Av-F5; Wed, 30 Oct 2024 10:34:04 -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 1t69lq-0002AO-SM for guix-patches@gnu.org; Wed, 30 Oct 2024 10:34:02 -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 1t69lq-0003cI-JU for guix-patches@gnu.org; Wed, 30 Oct 2024 10:34:02 -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=q6txwJN9CfhV3EkWBRA1XzncYRUDlSbnzIZ2HGYsg08=; b=cmorBchXL06EHKLEZkEek77k55TdKtk3Jgf0M/p7oO9HYQgDK34t6T8xrq0wNkihdPeunG2aTwBBOF7oRj8kPyHD/lvMI7tfs22SZZgTm1NDeyLdYGmxuHBXOKmoI8Oye6vHBmyzls8BM3dQYvOosfjHEejG9/tCex740zm6nhRLVaautQlkpukhbwNsfAISY+U86QRRZ0ELDaBrPbk4ZvW732KkEbZ1KX0vs/O6L+6pkgWPs25ipq7l0amqmLCOMxLlV89F3klPq1nyF2lRCGTUhJsQXhtXuCMd9yl/cicrGUuNSV0qb/WdSa116oIurfKdSGAUUMTsvCXWysqLUg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1t69lq-0003xo-74 for guix-patches@gnu.org; Wed, 30 Oct 2024 10:34:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#73927] [PATCH v4 01/18] gnu: guile-fibers: Fix cross-build for the Hurd. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 30 Oct 2024 14:34:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 73927 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 73927@debbugs.gnu.org Received: via spool by 73927-submit@debbugs.gnu.org id=B73927.173029880515047 (code B ref 73927); Wed, 30 Oct 2024 14:34:02 +0000 Received: (at 73927) by debbugs.gnu.org; 30 Oct 2024 14:33:25 +0000 Received: from localhost ([127.0.0.1]:35295 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t69lB-0003uB-Pp for submit@debbugs.gnu.org; Wed, 30 Oct 2024 10:33:25 -0400 Received: from eggs.gnu.org ([209.51.188.92]:36108) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t69l7-0003tb-5x for 73927@debbugs.gnu.org; Wed, 30 Oct 2024 10:33:19 -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 1t69iw-0003KJ-OW; Wed, 30 Oct 2024 10:31:02 -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=q6txwJN9CfhV3EkWBRA1XzncYRUDlSbnzIZ2HGYsg08=; b=aaVdvn94dl9NNshGOscx yRapAq+RMxzkucjBcICJftz7b9/MiZc/41/kw2FxSf7iPx5Dd4MrlRgEHMMIf2S2dxJ/huUWSsCgj 6ilYPOS75R/z6yOgs3nGT8ASMLQv4Dr/9W+VdFwobZIThLLPMOFGdeFJilC2w8uShqVul9xbCWBsz TcOvz/dkIxRu0uisochLe/TxLCpLYpppJG8mDQ5TpImaNheniR0DGpsFQpRvKZadzweKsnDQuCjCC PTxuaJgljoSDoKPhKveZ8c5+KQt4lcohu27zWxDRkJUxg4CktPD0Tao1HC8Xyqrb+MKpptMuJX4Td fiTb+ZkYmwnyTg==; From: Janneke Nieuwenhuizen Date: Wed, 30 Oct 2024 15:30:30 +0100 Message-ID: <839cf9a07b8a3b4b085058cc669040e4dbc6b42f.1730296564.git.janneke@gnu.org> X-Mailer: git-send-email 2.46.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/guile-xyz.scm (guile-fibers): When cross-building for the Hurd, add "fix-env" phase. Change-Id: Iebe12941bbfb2f5a6208f9364115e95f10e82ed6 --- gnu/packages/guile-xyz.scm | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index 5f34ea98a6..06d3b59dc3 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -9,7 +9,7 @@ ;;; Copyright © 2016, 2017, 2021 Alex Kost ;;; Copyright © 2016, 2017 Adonay "adfeno" Felipe Nogueira ;;; Copyright © 2016, 2021 Amirouche -;;; Copyright © 2016, 2019, 2021, 2023 Janneke Nieuwenhuizen +;;; Copyright © 2016, 2019, 2021, 2023, 2024 Janneke Nieuwenhuizen ;;; Copyright © 2017 Andy Wingo ;;; Copyright © 2017 David Thompson ;;; Copyright © 2017, 2018, 2019, 2020 Mathieu Othacehe @@ -875,7 +875,14 @@ (define-public guile-fibers (substitute* "tests/basic.scm" ((".*spawn-fiber-chain 5000000.*") "")) (substitute* "tests/channels.scm" - ((".*assert-run-fibers-terminates .*pingpong.*") ""))))))))) + ((".*assert-run-fibers-terminates .*pingpong.*") ""))))) + #$@(if (and (target-hurd?) (%current-target-system)) + #~((add-before 'build 'fixup-env + (lambda _ + (substitute* "env" + ((".*override.*" all) + (string-append "true #" all)))))) + '()))))) (native-inputs (list texinfo pkg-config autoconf-2.71 automake libtool guile-3.0 ;for 'guild compile