On Wed, Mar 25, 2015 at 10:20 PM, Ludovic Courtès <[email protected]> wrote: > Could you try ‘guix build ghc -s i686-linux -K’ and then investigate > from there? It might be clearer what needs to be patched.
That was indeed very useful! Thanks for making me discover the '-s' option :-) The attached patch should fix the problem. Regards, Fede
From 52b593fd287a76b6a7ab04e5a3dc82bf4dc72d6b Mon Sep 17 00:00:00 2001 From: Federico Beffa <[email protected]> Date: Sat, 28 Mar 2015 20:09:37 +0100 Subject: [PATCH] gnu: ghc: Fix i686 build. * gnu/packages/haskell.scm (ghc-bootstrap-7.8.4, ghc): Split 'ghc-bootstrap-7.8.4' into 'ghc-bootstrap-i686-7.8.4' and 'ghc-bootstrap-x86_64-7.8.4'. Select the appropriate input in 'ghc'. --- gnu/packages/haskell.scm | 30 +++++++++++++++++------------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 183d0eb..46a4b4f 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -33,22 +33,23 @@ #:use-module (gnu packages ncurses) #:use-module (gnu packages python)) -;; We use bootstrap binaries with a fix version which can be used to build -;; more versions of the GHC compiler. -(define ghc-bootstrap-7.8.4 +(define ghc-bootstrap-x86_64-7.8.4 (origin (method url-fetch) - (uri (string-append "https://www.haskell.org/ghc/dist/"; - "7.8.4/ghc-7.8.4-" - (if (string-match "x86_64" (%current-system)) - "x86_64" - "i386") - "-unknown-linux-deb7.tar.xz")) + (uri + "https://www.haskell.org/ghc/dist/7.8.4/ghc-7.8.4-x86_64-unknown-linux-deb7.tar.xz";) (sha256 (base32 - (if (string-match "x86_64" (%current-system)) - "13azsl53xgj20mi1hj9x0xb32vvcvs6cpmvwx6znxhas7blh0bpn" - "0wj5s435j0zgww70bj1d3f6wvnnpzlxwvwcyh2qv4qjq5z8j64kg"))))) + "13azsl53xgj20mi1hj9x0xb32vvcvs6cpmvwx6znxhas7blh0bpn")))) + +(define ghc-bootstrap-i686-7.8.4 + (origin + (method url-fetch) + (uri + "https://www.haskell.org/ghc/dist/7.8.4/ghc-7.8.4-i386-unknown-linux-deb7.tar.xz";) + (sha256 + (base32 + "0wj5s435j0zgww70bj1d3f6wvnnpzlxwvwcyh2qv4qjq5z8j64kg")))) ;; 43 tests out of 3965 fail. ;; @@ -99,7 +100,10 @@ ("ghostscript" ,ghostscript) ; for tests ("patchelf" ,patchelf) ;; GHC is built with GHC. Therefore we need bootstrap binaries. - ("ghc-binary" ,ghc-bootstrap-7.8.4))) + ("ghc-binary" + ,(if (string-match "x86_64" (or (%current-target-system) (%current-system))) + ghc-bootstrap-x86_64-7.8.4 + ghc-bootstrap-i686-7.8.4)))) (arguments `(#:test-target "test" ;; We get a smaller number of test failures by disabling parallel test -- 2.2.1
