From debbugs-submit-bounces@debbugs.gnu.org Tue Nov 30 06:14:43 2021 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 To: guix-patches@gnu.org Subject: [PATCH] gnu: ghc: Fix build on i686-linux. 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-Debbugs-CC: lars@6xq.net Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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-Spam-Score: 2.9 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * gnu/packages/haskell.scm (ghc-8.10)[arguments]<#:phases>: Fix failing test. --- gnu/packages/haskell.scm | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) 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 © 20 [...] Content analysis details: (2.9 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (zimon.toutoune[at]gmail.com) 2.0 PDS_OTHER_BAD_TLD Untrustworthy TLDs [URI: yoctocell.xyz (xyz)] 1.0 SPF_SOFTFAIL SPF: sender does not match SPF record (softfail) -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at https://www.dnswl.org/, medium trust [209.51.188.17 listed in list.dnswl.org] -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [209.51.188.17 listed in wl.mailspike.net] 1.3 SPOOFED_FREEMAIL No description available. 0.9 SPOOF_GMAIL_MID From Gmail but it doesn't seem to be... X-Debbugs-Envelope-To: submit Cc: zimoun X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.3 (/) * gnu/packages/haskell.scm (ghc-8.10)[arguments]<#:phases>: Fix failing test. --- gnu/packages/haskell.scm | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) 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") base-commit: f22dfba53032c59fb260173143abf0e4e9a4f1e1 -- 2.33.1