nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: python-gevent: Fix build with libev 4.25 and GCC 7. 

* gnu/packages/python-xyz.scm (python-gevent)[arguments]: Simplify libev
unbundling, which failed with the newer libev.  Use C_INCLUDE_PATH instead of CPATH.
[native-inputs]: Remove (PACKAGE-SOURCE LIBEV).
This commit is contained in:
Marius Bakke 2019-07-15 16:56:15 +02:00
parent c1cb85bf76
commit b5b56b7f27
No known key found for this signature in database
GPG Key ID: A2A06DF2A33A54FA
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
gnu/packages/python-xyz.scm
View File

@ -9823,13 +9823,6 @@ graphviz.")
(guix build utils) (guix build utils)
(guix build python-build-system)) (guix build python-build-system))
#:phases (modify-phases %standard-phases #:phases (modify-phases %standard-phases
(add-after 'unpack 'unpack-libev
(lambda* (#:key inputs #:allow-other-keys)
(mkdir-p "deps/libev")
;; FIXME: gevent requires building libev, even though
;; it only links against the proper one.
(invoke "tar" "-xf" (assoc-ref inputs "libev-source")
"--strip-components=1" "-C" "deps/libev")))
(add-before 'patch-source-shebangs 'patch-hard-coded-paths (add-before 'patch-source-shebangs 'patch-hard-coded-paths
(lambda _ (lambda _
(substitute* "src/gevent/subprocess.py" (substitute* "src/gevent/subprocess.py"
@ -9847,6 +9840,11 @@ graphviz.")
(setenv "CARES_EMBED" "false") (setenv "CARES_EMBED" "false")
(setenv "EMBED" "false") (setenv "EMBED" "false")
;; Prevent building bundled libev.
(substitute* "setup.py"
(("run_make=_BUILDING")
"run_make=False"))
(let ((greenlet (string-append (let ((greenlet (string-append
(assoc-ref inputs "python-greenlet") (assoc-ref inputs "python-greenlet")
"/include"))) "/include")))
@ -9854,7 +9852,7 @@ graphviz.")
(lambda (item) (lambda (item)
(string-prefix? "python" item))) (string-prefix? "python" item)))
((python) ((python)
(setenv "CPATH" (setenv "C_INCLUDE_PATH"
(string-append greenlet "/" python))))) (string-append greenlet "/" python)))))
#t)) #t))
(add-before 'check 'skip-timer-test (add-before 'check 'skip-timer-test
@ -9886,8 +9884,7 @@ graphviz.")
`(("python-greenlet" ,python-greenlet) `(("python-greenlet" ,python-greenlet)
("python-objgraph" ,python-objgraph))) ("python-objgraph" ,python-objgraph)))
(native-inputs (native-inputs
`(("libev-source" ,(package-source libev)) `(("python-six" ,python-six)))
("python-six" ,python-six)))
(inputs (inputs
`(("c-ares" ,c-ares) `(("c-ares" ,c-ares)
("libev" ,libev))) ("libev" ,libev)))