summary refs log tree commit diff
path: root/gnu/packages/lisp-xyz.scm
diff options
context:
space:
mode:
authorMarius Bakke <mbakke@fastmail.com>2020-04-11 17:03:58 +0200
committerMarius Bakke <mbakke@fastmail.com>2020-04-11 17:03:58 +0200
commit8c83069b99b55527eed78f7581d97ca0173373bc (patch)
treebbf0db43e85b6cb6a69d9a62ae1548e004378e74 /gnu/packages/lisp-xyz.scm
parentc6d02bcf1bcc06c70e440221e317274926c0fce3 (diff)
downloadguix-8c83069b99b55527eed78f7581d97ca0173373bc.tar.gz
gnu: sbcl-burgled-batteries3: Fix build with Python 3.8.
* gnu/packages/lisp-xyz.scm (sbcl-burgled-batteries3)[arguments]: Remove "m"
suffix from Python include directory.  Add phase to remove deprecated Python
API binding.
Diffstat (limited to 'gnu/packages/lisp-xyz.scm')
-rw-r--r--gnu/packages/lisp-xyz.scm12
1 files changed, 9 insertions, 3 deletions
diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm
index 751da1b58c..4308add8f5 100644
--- a/gnu/packages/lisp-xyz.scm
+++ b/gnu/packages/lisp-xyz.scm
@@ -5105,11 +5105,17 @@ high-level way.  This library provides such operators.")
                (let ((python (assoc-ref inputs "python")))
                  (setenv "BB_PYTHON3_INCLUDE_DIR"
                          (string-append python "/include/python"
-                                        (python-version python)
-                                        "m"))
+                                        (python-version python)))
                  (setenv "BB_PYTHON3_DYLIB"
                          (string-append python "/lib/libpython3.so"))
-                 #t))))))
+                 #t)))
+           (add-after 'unpack 'adjust-for-python-3.8
+             (lambda _
+               ;; This method is no longer part of the public API.
+               (substitute* "ffi-interface.lisp"
+                 ((".*PyEval_ReInitThreads.*")
+                  ""))
+               #t)))))
       (native-inputs
        `(("sbcl-cl-fad" ,sbcl-cl-fad)
          ("sbcl-lift" ,sbcl-lift)