diff options
| author | Ricardo Wurmus <rekado@elephly.net> | 2019-01-25 10:41:40 +0100 |
|---|---|---|
| committer | Ricardo Wurmus <rekado@elephly.net> | 2019-01-25 13:21:18 +0100 |
| commit | 35faa006864efb2475524d121053893e73015ef1 (patch) | |
| tree | 460aaedbf4d7d8b2f10b65f54e893f6ab8a3f39a /gnu | |
| parent | 492ee4f83bbb803e0135cc42d8a0d80d5e1787ad (diff) | |
| download | guix-35faa006864efb2475524d121053893e73015ef1.tar.gz | |
gnu: libnl: Unconditionally return #T from build phases.
* gnu/packages/linux.scm (libnl)[arguments]: Use INVOKE and unconditionally return #T from all build phases.
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/packages/linux.scm | 26 |
1 files changed, 12 insertions, 14 deletions
diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 135c47f6b1..acbc117ec9 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -12,7 +12,7 @@ ;;; Copyright © 2016 Raymond Nicholson <rain1@openmailbox.org> ;;; Copyright © 2016 Mathieu Lirzin <mthl@gnu.org> ;;; Copyright © 2016, 2018 Nicolas Goaziou <mail@nicolasgoaziou.fr> -;;; Copyright © 2016, 2018 Ricardo Wurmus <rekado@elephly.net> +;;; Copyright © 2016, 2018, 2019 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2016 David Craven <david@craven.ch> ;;; Copyright © 2016 John Darrington <jmd@gnu.org> ;;; Copyright © 2016, 2017, 2018 Marius Bakke <mbakke@fastmail.com> @@ -1511,25 +1511,23 @@ transparently through a bridge.") (add-after 'install 'install-python (lambda* (#:key outputs #:allow-other-keys) (define (python-inst python) - (let ((ldflags (format #f "LDFLAGS=-Wl,-rpath=~a/lib" - (assoc-ref %outputs "out"))) - (pyout (assoc-ref %outputs python))) - (and - (zero? (system (format #f "~a ~a setup.py build" - ldflags python pyout))) - (zero? - (system (format #f "~a ~a setup.py install --prefix=~a" - ldflags python pyout))) - (zero? (system* python "setup.py" "clean"))))) + (invoke python "setup.py" "build") + (invoke python "setup.py" "install" + (string-append "--prefix=" + (assoc-ref %outputs python))) + (invoke python "setup.py" "clean")) + (setenv "LDFLAGS" (format #f "-Wl,-rpath=~a/lib" + (assoc-ref %outputs "out"))) (with-directory-excursion "./python" - (every python-inst '("python2" "python3"))))) + (for-each python-inst '("python2" "python3"))) + #t)) (add-after 'install 'install-doc (lambda* (#:key inputs outputs #:allow-other-keys) (let ((dest (string-append (assoc-ref outputs "doc") "/share/doc/libnl"))) (mkdir-p dest) - (zero? (system* "tar" "xf" (assoc-ref inputs "libnl3-doc") - "--strip-components=1" "-C" dest)))))))) + (invoke "tar" "xf" (assoc-ref inputs "libnl3-doc") + "--strip-components=1" "-C" dest))))))) (home-page "https://www.infradead.org/~tgr/libnl/") (synopsis "NetLink protocol library suite") (description |