diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2019-07-15 16:56:15 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2019-07-15 16:56:15 +0200 |
| commit | b5b56b7f27dc902721ce23dfcbbbf777026186e8 (patch) | |
| tree | a76502fefb3b238a76d7f5061d9644a833046ba3 | |
| parent | c1cb85bf765e71aef674a132df644f4edf06a8e1 (diff) | |
| download | guix-b5b56b7f27dc902721ce23dfcbbbf777026186e8.tar.gz guix-b5b56b7f27dc902721ce23dfcbbbf777026186e8.zip | |
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).
| -rw-r--r-- | gnu/packages/python-xyz.scm | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index ac43ef9057..e58acc3578 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -9823,13 +9823,6 @@ graphviz.") (guix build utils) (guix build python-build-system)) #: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 (lambda _ (substitute* "src/gevent/subprocess.py" @@ -9847,6 +9840,11 @@ graphviz.") (setenv "CARES_EMBED" "false") (setenv "EMBED" "false") + ;; Prevent building bundled libev. + (substitute* "setup.py" + (("run_make=_BUILDING") + "run_make=False")) + (let ((greenlet (string-append (assoc-ref inputs "python-greenlet") "/include"))) @@ -9854,7 +9852,7 @@ graphviz.") (lambda (item) (string-prefix? "python" item))) ((python) - (setenv "CPATH" + (setenv "C_INCLUDE_PATH" (string-append greenlet "/" python))))) #t)) (add-before 'check 'skip-timer-test @@ -9886,8 +9884,7 @@ graphviz.") `(("python-greenlet" ,python-greenlet) ("python-objgraph" ,python-objgraph))) (native-inputs - `(("libev-source" ,(package-source libev)) - ("python-six" ,python-six))) + `(("python-six" ,python-six))) (inputs `(("c-ares" ,c-ares) ("libev" ,libev))) |