me
/
guix
Archived
1
0
Fork 0
Code

gnu: python-cffi: Do not set PYTHONPATH. 

* gnu/packages/libffi.scm (python-cffi): Remove trailing #t.
[phases]{check}: Do not set PYTHONPATH.
master
Maxim Cournoyer 2021-01-22 16:52:32 -05:00
parent fcaec1c756
commit 220a153c2f
No known key found for this signature in database
GPG Key ID: 1260E46482E63562
1 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
gnu/packages/libffi.scm
View File

@ -6,7 +6,7 @@
;;; Copyright © 2016, 2017 Ben Woodcroft <donttrustben@gmail.com> ;;; Copyright © 2016, 2017 Ben Woodcroft <donttrustben@gmail.com>
;;; Copyright © 2017, 2019, 2020 Marius Bakke <marius@gnu.org> ;;; Copyright © 2017, 2019, 2020 Marius Bakke <marius@gnu.org>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2019 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; Copyright © 2019, 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2020 John Doe <dftxbs3e@free.fr> ;;; Copyright © 2020 John Doe <dftxbs3e@free.fr>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
@ -128,20 +128,10 @@ conversions for values passed between the two languages.")
`(("pkg-config" ,pkg-config) `(("pkg-config" ,pkg-config)
("python-pytest" ,python-pytest))) ("python-pytest" ,python-pytest)))
(arguments (arguments
`(#:modules ((ice-9 ftw) `(#:phases
(srfi srfi-26)
(guix build utils)
(guix build python-build-system))
#:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(replace 'check (replace 'check
(lambda _ (lambda _
(setenv "PYTHONPATH"
(string-append
(getenv "PYTHONPATH")
":" (getcwd) "/build/"
(car (scandir "build" (cut string-prefix? "lib." <>)))))
;; XXX The "normal" approach of setting CC and friends does ;; XXX The "normal" approach of setting CC and friends does
;; not work here. Is this the correct way of doing things? ;; not work here. Is this the correct way of doing things?
(substitute* "testing/embedding/test_basic.py" (substitute* "testing/embedding/test_basic.py"
@ -152,8 +142,7 @@ conversions for values passed between the two languages.")
"linker_so='gcc -shared')"))) "linker_so='gcc -shared')")))
(substitute* "testing/cffi0/test_ownlib.py" (substitute* "testing/cffi0/test_ownlib.py"
(("\"cc testownlib") "\"gcc testownlib")) (("\"cc testownlib") "\"gcc testownlib"))
(invoke "py.test" "-v" "c/" "testing/") (invoke "py.test" "-v" "c/" "testing/")))
#t))
(add-before 'check 'patch-paths-of-dynamically-loaded-libraries (add-before 'check 'patch-paths-of-dynamically-loaded-libraries
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
;; Shared libraries should be referred by their absolute path as ;; Shared libraries should be referred by their absolute path as
@ -176,8 +165,7 @@ conversions for values passed between the two languages.")
(format #f "lib_m = ['~a']" libm))) (format #f "lib_m = ['~a']" libm)))
(substitute* "c/test_c.py" (substitute* "c/test_c.py"
(("find_and_load_library\\(['\"]{1}c['\"]{1}") (("find_and_load_library\\(['\"]{1}c['\"]{1}")
(format #f "find_and_load_library('~a'" libc))) (format #f "find_and_load_library('~a'" libc)))))))))
#t))))))
(home-page "https://cffi.readthedocs.io/") (home-page "https://cffi.readthedocs.io/")
(synopsis "Foreign function interface for Python") (synopsis "Foreign function interface for Python")
(description "Foreign Function Interface for Python calling C code.") (description "Foreign Function Interface for Python calling C code.")