02/04: gnu: ecl: Fix build with LibFFI >= 3.3.

[guix-commits]

mbakke pushed a commit to branch core-updates
in repository guix.

commit 3a32940bfb2d7f4ce8f34cfeb1a3432d3d4ae241
Author: Marius Bakke <address@hidden>
AuthorDate: Wed Apr 8 13:53:35 2020 +0200

    gnu: ecl: Fix build with LibFFI >= 3.3.
    
    * gnu/packages/lisp.scm (ecl)[source](modules, snippet): New fields.
---
 gnu/packages/lisp.scm | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm
index 709ea88..cc40f58 100644
--- a/gnu/packages/lisp.scm
+++ b/gnu/packages/lisp.scm
@@ -15,6 +15,7 @@
 ;;; Copyright © 2019, 2020 Katherine Cox-Buday <address@hidden>
 ;;; Copyright © 2019 Jesse Gildersleve <address@hidden>
 ;;; Copyright © 2019, 2020 Guillaume Le Vaillant <address@hidden>
+;;; Copyright © 2020 Marius Bakke <address@hidden>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -230,7 +231,16 @@ interface to the Tk widget system.")
              "https://common-lisp.net/project/ecl/static/files/release/";
              name "-" version ".tgz"))
        (sha256
-        (base32 "0m0j24w5d5a9dwwqyrg0d35c0nys16ijb4r0nyk87yp82v38b9bn"))))
+        (base32 "0m0j24w5d5a9dwwqyrg0d35c0nys16ijb4r0nyk87yp82v38b9bn"))
+       (modules '((guix build utils)))
+       (snippet
+        '(begin
+           ;; Adjust for ABI change in LibFFI 3.3.  See:
+           ;; https://gitlab.com/embeddable-common-lisp/ecl/-/issues/302
+           ;; 
https://gitlab.com/embeddable-common-lisp/ecl/-/merge_requests/171
+           (substitute* "src/c/ffi.d"
+             (("FFI_SYSV") "FFI_UNIX64"))
+           #t))))
     (build-system gnu-build-system)
     ;; src/configure uses 'which' to confirm the existence of 'gzip'.
     (native-inputs `(("cl-asdf" ,cl-asdf)