From patchwork Fri Oct 25 09:39:53 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 69446 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 B158627BBE2; Fri, 25 Oct 2024 10:41:52 +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=-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=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 3D49A27BBE9 for ; Fri, 25 Oct 2024 10:41:52 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t4Gp4-0002Pa-M9; Fri, 25 Oct 2024 05:41:34 -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 1t4Gp1-0002OP-7f for guix-patches@gnu.org; Fri, 25 Oct 2024 05:41:31 -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 1t4Gp0-0003sk-Sc for guix-patches@gnu.org; Fri, 25 Oct 2024 05:41:30 -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=flD0+NLbFncv/7qoyAIgmBj3XyuhZ1e2BhQ6maNidi0=; b=daMEcSyXf+PyQYa6ksCPkZqthmNofkXL+AHHCPdmQ2KrUxlsinZTOkkwpNkrA4VIUEz6rQxQ9dbZp5VG6KLEROfEVZf0kKYSPcAOc9uuOTVcI0VqhanZKg1UxVOZ+Ag3F6dmSBApYVk8jWbg8X6h0Qg2F94u11HZkt5wI57VB5DgL8L2RSLbMaVFqE3c/ZFCb3xsUZtZt+Q2F8iegRqGyn68Af2hqbGB6nbMufSf0Y+GYfyg2LQb0dqgfwdVcbpt5irrVCeSsfu65F+C0+DkaXc/kBLnag6LlkNPwSnGCS2AkzEllahEqB23OoJfDHT89c0lyBvkK2umqAVFguWQYQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1t4GpW-00025d-5v for guix-patches@gnu.org; Fri, 25 Oct 2024 05:42:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#73927] [PATCH v3 01/17] 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: Fri, 25 Oct 2024 09:42: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.17298492727764 (code B ref 73927); Fri, 25 Oct 2024 09:42:02 +0000 Received: (at 73927) by debbugs.gnu.org; 25 Oct 2024 09:41:12 +0000 Received: from localhost ([127.0.0.1]:37289 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t4Gof-00020s-IY for submit@debbugs.gnu.org; Fri, 25 Oct 2024 05:41:12 -0400 Received: from eggs.gnu.org ([209.51.188.92]:43752) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t4Gob-0001zq-2u for 73927@debbugs.gnu.org; Fri, 25 Oct 2024 05:41:08 -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 1t4Gnz-0003lO-At; Fri, 25 Oct 2024 05:40:27 -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=flD0+NLbFncv/7qoyAIgmBj3XyuhZ1e2BhQ6maNidi0=; b=Vf9jcRgZdLTrJazEwlXp HJikIEszj12MocIxTq2B9ML5cHxvObcgfSeKdMi3j4kGwtyyeA40dmwMYGVqceOIVK3tb0ckNVRld NMwZfqZiu1OTihMWK1R/EpxuPPEk7SoCENzOE26O5OtgD9SH+g4rMDavf2IUNq7WC0SxipMHZrlXk JhEwLZnwhwQnWr3rm0bhAmdFgjqyWA+6TWd7Cx/mD8HzV+qR9vziIzw7COxU3tvW0v4wK9MNSBIQx IcxX8seUyoomjbFjg9FCQdPUU15MZvtrdMQjOqDXOpyK7D59sh5kjeZ/rKn7RBKq5QEs16ElJlF1O kvYPIZJVlv5epA==; From: Janneke Nieuwenhuizen Date: Fri, 25 Oct 2024 11:39:53 +0200 Message-ID: <20241025094011.8540-2-janneke@gnu.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20241025094011.8540-1-janneke@gnu.org> References: <20241025094011.8540-1-janneke@gnu.org> 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