From patchwork Tue Nov 30 11:14:27 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Simon Tournier X-Patchwork-Id: 34881 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 6BF8627BBEA; Tue, 30 Nov 2021 11:15:17 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,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 CCE6727BBE9 for ; Tue, 30 Nov 2021 11:15:16 +0000 (GMT) Received: from localhost ([::1]:38134 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ms16R-00059J-TE for patchwork@mira.cbaines.net; Tue, 30 Nov 2021 06:15:15 -0500 Received: from eggs.gnu.org ([209.51.188.92]:50646) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ms16F-00058b-Is for guix-patches@gnu.org; Tue, 30 Nov 2021 06:15:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:56971) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ms16F-0005Mu-8i for guix-patches@gnu.org; Tue, 30 Nov 2021 06:15:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ms16E-00087c-I6; Tue, 30 Nov 2021 06:15:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#52198] [PATCH] gnu: ghc: Fix build on i686-linux. Resent-From: zimoun Original-Sender: "Debbugs-submit" Resent-CC: lars@6xq.net, guix-patches@gnu.org Resent-Date: Tue, 30 Nov 2021 11:15:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 52198 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 52198@debbugs.gnu.org Cc: zimoun , lars@6xq.net X-Debbugs-Original-To: guix-patches@gnu.org X-Debbugs-Original-Xcc: lars@6xq.net Received: via spool by submit@debbugs.gnu.org id=B.163827088331175 (code B ref -1); Tue, 30 Nov 2021 11:15:02 +0000 Received: (at submit) by debbugs.gnu.org; 30 Nov 2021 11:14:43 +0000 Received: from localhost ([127.0.0.1]:40282 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ms15v-00086l-Ee for submit@debbugs.gnu.org; Tue, 30 Nov 2021 06:14:43 -0500 Received: from lists.gnu.org ([209.51.188.17]:39690) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ms15t-00086d-H7 for submit@debbugs.gnu.org; Tue, 30 Nov 2021 06:14:41 -0500 Received: from eggs.gnu.org ([209.51.188.92]:50504) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ms15s-000530-JI for guix-patches@gnu.org; Tue, 30 Nov 2021 06:14:41 -0500 Received: from [2a00:1450:4864:20::42c] (port=33474 helo=mail-wr1-x42c.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ms15o-0005Gy-HK for guix-patches@gnu.org; Tue, 30 Nov 2021 06:14:40 -0500 Received: by mail-wr1-x42c.google.com with SMTP id d24so43640699wra.0 for ; Tue, 30 Nov 2021 03:14:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=regOEmLptOrVBrRUYUu2tphHGWaMG5LObhbiVO5t52o=; b=emh4q093YY9aqo5OOUPY/ukqMODO82Rh97GTUjJceCMerBDa3vS7EkV1IhLaIGKKZA pUZQV+P41F5hQkjV6ClR3812QVafgXnCIpb5hp5l3H18Jxm4A7E83d1Hl7MJAP+ULN9J 2FVvj5aUYij+SiDJ5DcFlNEOQ5vVj1keD0ilSRqYyVRvD0jlzSm3uuvIlgTT8e9maEcc LmEmcyCrLd8VNLVqgUDNntdkptq/AXMu1Hb7l+vYVJEaTtPjwK/LpOv88tX0J0mL+xVc 4zbtGxm+S9sSjGT9NBHbWBcNpXEcjVsjxFV7PAm5qQ8suD/BBe2B6BjZR88GmQRq5rjX l0+Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=regOEmLptOrVBrRUYUu2tphHGWaMG5LObhbiVO5t52o=; b=5AQr9Re6KcjWQjiB5oTey7siv1m6JqTW367bwvpLmjmm2xhjdBZCZzdvYodBoAWYcj ZWOGR8ywr0yowfRY6ClCd4KuWkC6MW8BfYcVmOwyCVBHnFFLYlhKgtPcvBd1pP9G8Xq7 t32zMr57Eb4cTJTdgNgWZMrBOsmobTpxsx9QoafzEY2QVrBM8UdDMdjOFvf6ljUNVFfj EvQsOQviSlI5mVVYHG30uKnj6RHNmT9cy6rfOa+mwNf+Unklr+f/EoAxfrAocXpcP+9p WsBPwC/LNBFqYQqxL5EDBPsD7Jk2vw2iGmtLSZq8gUmbU2P/8LZ+wgO2s6lz7vZNyS3g 39RQ== X-Gm-Message-State: AOAM533jtFNgUTV8s4mMl933TvhbRea4uq1ayRGX+Fml+pcfvtk5S87y /nhMk6U7uiDuJBbegNJ3CJFVqXUwPP8= X-Google-Smtp-Source: ABdhPJx6BdjwCmJhXP3aLm5wsNFK1YTwQcnwMVcTOppna8v4c0XwVyU4+jvqEP/CWnkiNF8AMtc5tA== X-Received: by 2002:a5d:64eb:: with SMTP id g11mr40352715wri.438.1638270874489; Tue, 30 Nov 2021 03:14:34 -0800 (PST) Received: from localhost.localdomain ([193.48.40.117]) by smtp.gmail.com with ESMTPSA id h18sm17783488wre.46.2021.11.30.03.14.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Nov 2021 03:14:34 -0800 (PST) From: zimoun Date: Tue, 30 Nov 2021 12:14:27 +0100 Message-Id: <20211130111427.3199918-1-zimon.toutoune@gmail.com> X-Mailer: git-send-email 2.33.1 MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::42c (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::42c; envelope-from=zimon.toutoune@gmail.com; helo=mail-wr1-x42c.google.com X-Spam_score_int: -12 X-Spam_score: -1.3 X-Spam_bar: - X-Spam_report: (-1.3 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, PDS_HP_HELO_NORDNS=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/haskell.scm (ghc-8.10)[arguments]<#:phases>: Fix failing test. --- gnu/packages/haskell.scm | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) base-commit: f22dfba53032c59fb260173143abf0e4e9a4f1e1 diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 69a806e635..d3db023f08 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -22,6 +22,7 @@ ;;; Copyright © 2020 Marius Bakke ;;; Copyright © 2021 Matthew James Kraai ;;; Copyright © 2021 Xinglu Chen +;;; Copyright © 2021 Simon Tournier ;;; ;;; This file is part of GNU Guix. ;;; @@ -711,12 +712,18 @@ (define-public ghc-8.10 (("\\]\\), " all) (string-append all "expect_broken(0)], "))))) ;; TODO: Turn this into an undconditional patch on the next rebuild. - ,@(if (string=? "i686-linux" (%current-system)) + ,@(if (string-prefix? "i686" (or (%current-target-system) + (%current-system))) '((add-after 'skip-more-tests 'skip-failing-tests-i686 (lambda _ (substitute* '("testsuite/tests/codeGen/should_compile/all.T") (("(test\\('T15155l', )when\\(unregisterised\\(\\), skip\\)" all before) - (string-append before "when(arch('i386'), skip)")))))) + (string-append before "when(arch('i386'), skip)"))) + ;; Unexpected failures: + ;; quasiquotation/T14028.run T14028 [bad stderr] (dyn) + (substitute* '("testsuite/tests/quasiquotation/all.T") + (("unless\\(config.have_ext_interp, skip\\),") + "unless(config.have_ext_interp, skip), when(arch('i386'), skip),"))))) '()))))) (native-search-paths (list (search-path-specification (variable "GHC_PACKAGE_PATH")