From 35faa006864efb2475524d121053893e73015ef1 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 25 Jan 2019 10:41:40 +0100 Subject: gnu: libnl: Unconditionally return #T from build phases. * gnu/packages/linux.scm (libnl)[arguments]: Use INVOKE and unconditionally return #T from all build phases. --- gnu/packages/linux.scm | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) (limited to 'gnu') 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 ;;; Copyright © 2016 Mathieu Lirzin ;;; Copyright © 2016, 2018 Nicolas Goaziou -;;; Copyright © 2016, 2018 Ricardo Wurmus +;;; Copyright © 2016, 2018, 2019 Ricardo Wurmus ;;; Copyright © 2016 David Craven ;;; Copyright © 2016 John Darrington ;;; Copyright © 2016, 2017, 2018 Marius Bakke @@ -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 -- cgit 1.4.1