02/02: gnu: sbcl-cffi-libffi: Fix building on ARM hardware.

[guix-commits]

efraim pushed a commit to branch master
in repository guix.

commit a13063d6ac7434beed1c608ce3eb6fb39c740b33
Author: Efraim Flashner <efraim@flashner.co.il>
AuthorDate: Wed Nov 11 17:22:07 2020 +0200

    gnu: sbcl-cffi-libffi: Fix building on ARM hardware.
    
    * gnu/packages/lisp-xyz.scm (sbcl-cffi-libffi-bootstrap)[arguments]: Add
    phase to adapt code to changes in libffi.
---
 gnu/packages/lisp-xyz.scm | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm
index d95da9c..dfc5a2a 100644
--- a/gnu/packages/lisp-xyz.scm
+++ b/gnu/packages/lisp-xyz.scm
@@ -6,7 +6,7 @@
 ;;; Copyright © 2016, 2017 Nikita <nikita@n0.is>
 ;;; Copyright © 2016, 2017 Andy Patterson <ajpatter@uwaterloo.ca>
 ;;; Copyright © 2017, 2019, 2020 Ricardo Wurmus <rekado@elephly.net>
-;;; Copyright © 2017, 2018, 2019 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2017, 2018, 2019, 2020 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2017, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
 ;;; Copyright © 2018 Benjamin Slade <slade@jnanam.net>
 ;;; Copyright © 2018 Alex Vong <alexvong1995@gmail.com>
@@ -2540,6 +2540,12 @@ non-consing thread safe queues and fibonacci priority 
queues.")
     (arguments
      '(#:phases
        (modify-phases %standard-phases
+         (add-after 'unpack 'fix-arm-support
+           (lambda _
+             ;; This is apparently deprecated since libffi-3.3.
+             (substitute* "libffi/libffi-types.lisp"
+               (("\\\(\\\(:unix64.*") ")\n"))
+             #t))
          (add-after 'unpack 'fix-paths
            (lambda* (#:key inputs #:allow-other-keys)
              (substitute* "libffi/libffi.lisp"