From patchwork Tue Aug 17 10:19:03 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Efraim Flashner X-Patchwork-Id: 32148 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 4E37D27BC78; Tue, 17 Aug 2021 11:24:35 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 1BE8427BC6B for ; Tue, 17 Aug 2021 11:24:35 +0100 (BST) Received: from localhost ([::1]:59956 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mFwGo-0004K4-7p for patchwork@mira.cbaines.net; Tue, 17 Aug 2021 06:24:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52242) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mFwGI-0003UI-T0 for guix-patches@gnu.org; Tue, 17 Aug 2021 06:24:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:40235) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mFwGI-0005Gp-MJ for guix-patches@gnu.org; Tue, 17 Aug 2021 06:24:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mFwGI-00044P-Iu for guix-patches@gnu.org; Tue, 17 Aug 2021 06:24:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50091] [PATCH 05/21] gnu: guile: Fix building on riscv64-linux. Resent-From: Efraim Flashner Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 17 Aug 2021 10:24:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50091 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50091@debbugs.gnu.org Cc: Efraim Flashner Received: via spool by 50091-submit@debbugs.gnu.org id=B50091.162919583315620 (code B ref 50091); Tue, 17 Aug 2021 10:24:02 +0000 Received: (at 50091) by debbugs.gnu.org; 17 Aug 2021 10:23:53 +0000 Received: from localhost ([127.0.0.1]:51780 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mFwG8-00043s-QL for submit@debbugs.gnu.org; Tue, 17 Aug 2021 06:23:53 -0400 Received: from flashner.co.il ([178.62.234.194]:45914) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mFwG7-00043a-6m for 50091@debbugs.gnu.org; Tue, 17 Aug 2021 06:23:51 -0400 Received: from localhost (unknown [141.226.169.107]) by flashner.co.il (Postfix) with ESMTPSA id 8F35C402E0; Tue, 17 Aug 2021 10:23:45 +0000 (UTC) From: Efraim Flashner Date: Tue, 17 Aug 2021 13:19:03 +0300 Message-Id: <9440a6ca3c1318e99dc1eb16f7e382ee888464fc.1629193993.git.efraim@flashner.co.il> X-Mailer: git-send-email 2.32.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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/guile.scm (guile-3.0)[arguments]: On riscv64-linux add a phase to skip a failing test. --- gnu/packages/guile.scm | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index fffc30f913..f9a7125f83 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -65,7 +65,8 @@ #:use-module (guix deprecation) #:use-module (guix utils) #:use-module (ice-9 match) - #:use-module ((srfi srfi-1) #:prefix srfi-1:)) + #:use-module ((srfi srfi-1) #:prefix srfi-1:) + #:use-module (srfi srfi-26)) ;;; Commentary: ;;; @@ -346,14 +347,17 @@ without requiring the source code to be rewritten.") ;; https://debbugs.gnu.org/cgi/bugreport.cgi?bug=45214 (substitute* "bootstrap/Makefile.in" (("^GUILE_OPTIMIZATIONS.*") - "GUILE_OPTIMIZATIONS = -O1 -Oresolve-primitives -Ocps\n")))) - (add-after 'unpack 'skip-failing-fdes-test - (lambda _ - ;; ERROR: ((system-error "seek" "~A" ("Bad file descriptor") (9))) - (substitute* "test-suite/tests/ports.test" - (("fdes not closed\"" all) (string-append all "(exit 77)"))) - #t))) - '()))))) + "GUILE_OPTIMIZATIONS = -O1 -Oresolve-primitives -Ocps\n"))))) + '()) + ,@(if (srfi-1:any (cute string-prefix? <> (%current-system)) + '("powerpc-" "riscv64-")) + `((add-after 'unpack 'skip-failing-fdes-test + (lambda _ + ;; ERROR: ((system-error "seek" "~A" ("Bad file descriptor") (9))) + (substitute* "test-suite/tests/ports.test" + (("fdes not closed\"" all) (string-append all "(exit 77)"))) + #t))) + '()))))) (native-search-paths (list (search-path-specification