From patchwork Sat Jul 15 09:39:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christopher Baines X-Patchwork-Id: 51724 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 7481D27BBE9; Sat, 15 Jul 2023 10:40:28 +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=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, 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 481AF27BBE2 for ; Sat, 15 Jul 2023 10:40:26 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qKbl2-0007pJ-Lu; Sat, 15 Jul 2023 05:40:08 -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 1qKbkz-0007on-Vb for guix-patches@gnu.org; Sat, 15 Jul 2023 05:40:06 -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 1qKbkw-0005HH-Q9 for guix-patches@gnu.org; Sat, 15 Jul 2023 05:40:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qKbkw-0004di-EO; Sat, 15 Jul 2023 05:40:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64643] [PATCH] gnu: ghc-8.10: Fix build on i686-linux. Resent-From: Christopher Baines Original-Sender: "Debbugs-submit" Resent-CC: lars@6xq.net, guix-patches@gnu.org Resent-Date: Sat, 15 Jul 2023 09:40:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 64643 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64643@debbugs.gnu.org Cc: Lars-Dominik Braun X-Debbugs-Original-To: guix-patches@gnu.org X-Debbugs-Original-Xcc: Lars-Dominik Braun Received: via spool by submit@debbugs.gnu.org id=B.168941398217793 (code B ref -1); Sat, 15 Jul 2023 09:40:02 +0000 Received: (at submit) by debbugs.gnu.org; 15 Jul 2023 09:39:42 +0000 Received: from localhost ([127.0.0.1]:44177 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qKbkc-0004cv-3C for submit@debbugs.gnu.org; Sat, 15 Jul 2023 05:39:42 -0400 Received: from lists.gnu.org ([2001:470:142::17]:40254) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qKbkZ-0004ci-Pl for submit@debbugs.gnu.org; Sat, 15 Jul 2023 05:39:40 -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 1qKbkU-0007lL-JI for guix-patches@gnu.org; Sat, 15 Jul 2023 05:39:34 -0400 Received: from mira.cbaines.net ([212.71.252.8]) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qKbkT-0005CO-8I for guix-patches@gnu.org; Sat, 15 Jul 2023 05:39:34 -0400 Received: from localhost (unknown [IPv6:2a02:8010:68c1:0:54d1:d5d4:280e:f699]) by mira.cbaines.net (Postfix) with ESMTPSA id 751A827BBE2 for ; Sat, 15 Jul 2023 10:39:31 +0100 (BST) Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id 6d32bde9 for ; Sat, 15 Jul 2023 09:39:31 +0000 (UTC) From: Christopher Baines Date: Sat, 15 Jul 2023 10:39:30 +0100 Message-ID: <083e20c72d24a3ed0bc00959ae2053784b03bada.1689413970.git.mail@cbaines.net> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Received-SPF: pass client-ip=212.71.252.8; envelope-from=mail@cbaines.net; helo=mira.cbaines.net X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01, UNPARSEABLE_RELAY=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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 As one profiling test fails very repeatedly on the bordeaux build farm, but ghc did seem to build successfully on other machines. * gnu/packages/haskell.scm (ghc-8.10)[arguments]: Don't run the T11627a profiling test on i686-linux. --- gnu/packages/haskell.scm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) base-commit: b5a5e4d712d0a1998995be62bb41b03955b7dcf1 prerequisite-patch-id: 3297b62c093009d94f43908e88dfc50a53ccbeac diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 6b2c86fec4..62815efbb1 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -1271,8 +1271,11 @@ (define-public ghc-8.10 ;; next rebuild. Note that they are required for GHC 8.10 and 9.2. #$@(if (string-prefix? "i686" (or (%current-target-system) (%current-system))) - #~((add-after 'skip-failing-tests-i686 'skip-failing-tests-i686-cuirass + #~((add-after 'skip-failing-tests-i686 'skip-more-failing-tests-i686 (lambda _ + (substitute* '("testsuite/tests/profiling/should_run/all.T") + (("test\\('T11627a', \\[ ") + "test('T11627a', [ when(arch('i386'), skip), ")) (substitute* '("testsuite/driver/testlib.py") ((".*changes being made to the file will invalidate the code signature.*") "")