From 3a32940bfb2d7f4ce8f34cfeb1a3432d3d4ae241 Mon Sep 17 00:00:00 2001
From: Marius Bakke <mbakke@fastmail.com>
Date: Wed, 8 Apr 2020 13:53:35 +0200
Subject: 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(-)

(limited to 'gnu')

diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm
index 709ea88ae0..cc40f58e6e 100644
--- a/gnu/packages/lisp.scm
+++ b/gnu/packages/lisp.scm
@@ -15,6 +15,7 @@
 ;;; Copyright © 2019, 2020 Katherine Cox-Buday <cox.katherine.e@gmail.com>
 ;;; Copyright © 2019 Jesse Gildersleve <jessejohngildersleve@protonmail.com>
 ;;; Copyright © 2019, 2020 Guillaume Le Vaillant <glv@posteo.net>
+;;; Copyright © 2020 Marius Bakke <mbakke@fastmail.com>
 ;;;
 ;;; 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)
-- 
cgit v1.2.3

rm'><form class='right' method='get' action='/guix/log/gnu/installer/substitutes.scm'>
<input type='hidden' name='id' value='8cb6fc32a6dfae42086e352c3be7f1ff856fe284'/><input type='hidden' name='showmsg' value='1'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=8cb6fc32a6dfae42086e352c3be7f1ff856fe284&amp;showmsg=1'>root</a>/<a href='/guix/log/gnu?id=8cb6fc32a6dfae42086e352c3be7f1ff856fe284&amp;showmsg=1'>gnu</a>/<a href='/guix/log/gnu/installer?id=8cb6fc32a6dfae42086e352c3be7f1ff856fe284&amp;showmsg=1'>installer</a>/<a href='/guix/log/gnu/installer/substitutes.scm?id=8cb6fc32a6dfae42086e352c3be7f1ff856fe284&amp;showmsg=1'>substitutes.scm</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/gnu/installer/substitutes.scm?id=8cb6fc32a6dfae42086e352c3be7f1ff856fe284'>Collapse</a>)</th><th class='left'>Author</th></tr>
<tr class='logheader'><td><span title='2020-12-11 21:37:07 +0100'>2020-12-11</span></td><td class='logsubject'><a href='/guix/commit/gnu/installer/substitutes.scm?id=8361817bf693742757b096468198626f297bb09e'>install: Discover local substitute servers.</a></td><td>Mathieu Othacehe</td></tr>
<tr class='nohover-highlight'><td/><td colspan='3' class='logmsg'>
* gnu/installer/substitutes.scm: New file.
* gnu/installer/newt/substitutes.scm: New file.
* gnu/local.mk (INSTALLER_MODULES): Add them.
* po/guix/POTFILES.in: Add gnu/installer/newt/substitutes.scm.
* gnu/installer/proxy.scm (with-silent-shepherd): Move to ...
* gnu/installer/utils.scm: ... here.
* gnu/installer/record.scm (&lt;installer&gt;)[substitutes-page]: New field.
* gnu/installer/newt.scm (substitutes-page): New procedure,
(newt-installer): register it.
* gnu/installer.scm (installer-steps): Add "substitutes-page" step.
* gnu/system/install.scm (%installation-services): Add avahi-service-type and
enable substitute server discover in guix-service-type.
[&lt;name-service-switch&gt;]: Set it to %mdns-host-lookup-nss.


</td></tr>