mirror of
https://git.savannah.gnu.org/git/guix.git
synced 2026-05-26 11:01:48 +02:00
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.
This commit is contained in:
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user