bug#52198: closed ([core-updates-frozen] [PATCH] gnu: ghc: Fix build on i686-linux.)

[GNU bug Tracking System]

Your message dated Tue, 30 Nov 2021 16:57:22 +0100
with message-id <YaZJ4r740RT4uJiB@noor.fritz.box>
and subject line Re: [bug#52198] [PATCH] gnu: ghc: Fix build on i686-linux.
has caused the debbugs.gnu.org bug report #52198,
regarding [core-updates-frozen] [PATCH] gnu: ghc: Fix build on i686-linux.
to be marked as done.

(If you believe you have received this mail in error, please contact
help-debbugs@gnu.org.)


-- 
52198: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=52198
GNU Bug Tracking System
Contact help-debbugs@gnu.org with problems
> --- Begin Message ---
>
>
>
> Subject: 
>
> [PATCH] gnu: ghc: Fix build on i686-linux.
>
>
>
>
> Date: 
>
> Tue, 30 Nov 2021 12:14:27 +0100
>
>
>
>
> * 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 <mbakke@fastmail.com>
>  ;;; Copyright © 2021 Matthew James Kraai <kraai@ftbfs.org>
>  ;;; Copyright © 2021 Xinglu Chen <public@yoctocell.xyz>
> +;;; Copyright © 2021 Simon Tournier <zimon.toutoune@gmail.com>
>  ;;;
>  ;;; 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
>
>
>
>
> --- End Message ---
> --- Begin Message ---
>
>
>
> Subject: 
>
> Re: [bug#52198] [PATCH] gnu: ghc: Fix build on i686-linux.
>
>
>
>
> Date: 
>
> Tue, 30 Nov 2021 16:57:22 +0100
>
>
>
>
> Hi zimoun,
>
> I locally built ghc@8.10 and this test indeed fails without/succeeds
> with the patch. There’s also an issue over at the GHC tracker
> about this failure, so I’m assuming it’s safe to skip:
> https://gitlab.haskell.org/ghc/ghc/-/issues/17300
>
> I pushed this patch to core-updates-frozen as
> afc4945d44aeb6750b980abddbfda66f6ccb6b18. Thank you!
>
> Cheers,
> Lars
>
>
>
> --- End Message ---