diff options
| author | Marius Bakke <marius@gnu.org> | 2022-08-11 19:02:53 +0200 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2022-08-11 22:39:13 +0200 |
| commit | 462008057808ab02821d05979cb8d2f4d0769f66 (patch) | |
| tree | 00fc4abcfa96af0ea639dee3892e3ed0733a3d4c /gnu/packages/haskell.scm | |
| parent | 121f6e0b0c45dba24301fbd405d07123e82c2de6 (diff) | |
| download | guix-462008057808ab02821d05979cb8d2f4d0769f66.tar guix-462008057808ab02821d05979cb8d2f4d0769f66.tar.gz | |
gnu: ghc: Use a LibFFI variant without static trampolines.
* gnu/packages/haskell.scm (ghc-7, ghc-8.0, ghc-8.4)[inputs]: Change from
LIBFFI to LIBFFI-SANS-STATIC-TRAMPOLINES.
* gnu/packages/libffi.scm (libffi-sans-static-trampolines): New variable.
Diffstat (limited to 'gnu/packages/haskell.scm')
| -rw-r--r-- | gnu/packages/haskell.scm | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index effc6eeb1b..ad2aa20ee1 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -423,7 +423,11 @@ libraries are included in this package.") (inputs `(("gmp" ,gmp) ("ncurses" ,ncurses) - ("libffi" ,libffi) + + ;; Use a LibFFI variant without static trampolines to work around + ;; <https://gitlab.haskell.org/ghc/ghc/-/issues/20051>. + ("libffi" ,libffi-sans-static-trampolines) + ("ghc-testsuite" ,(origin (method url-fetch) @@ -597,7 +601,11 @@ interactive environment for the functional language Haskell.") (inputs `(("gmp" ,gmp) ("ncurses" ,ncurses) - ("libffi" ,libffi) + + ;; Use a LibFFI variant without static trampolines to work around + ;; <https://gitlab.haskell.org/ghc/ghc/-/issues/20051>. + ("libffi" ,libffi-sans-static-trampolines) + ("ghc-testsuite" ,(origin (method url-fetch) @@ -696,7 +704,9 @@ interactive environment for the functional language Haskell.") (sha256 (base32 "1ch4j2asg7pr52ai1hwzykxyj553wndg7wq93i47ql4fllspf48i")))) (inputs - (list gmp ncurses libffi)) + ;; Note: GHC < 9 requires LibFFI < 3.4, or a variant without static + ;; trampolines. + (list gmp ncurses libffi-sans-static-trampolines)) (native-inputs `(("perl" ,perl) ("python" ,python) ; for tests |