[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
05/27: gnu: libnl: Unconditionally return #T from build phases.
From: |
guix-commits |
Subject: |
05/27: gnu: libnl: Unconditionally return #T from build phases. |
Date: |
Fri, 25 Jan 2019 07:21:30 -0500 (EST) |
rekado pushed a commit to branch master
in repository guix.
commit 35faa006864efb2475524d121053893e73015ef1
Author: Ricardo Wurmus <address@hidden>
Date: Fri Jan 25 10:41:40 2019 +0100
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(-)
diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 135c47f..acbc117 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -12,7 +12,7 @@
;;; Copyright © 2016 Raymond Nicholson <address@hidden>
;;; Copyright © 2016 Mathieu Lirzin <address@hidden>
;;; Copyright © 2016, 2018 Nicolas Goaziou <address@hidden>
-;;; Copyright © 2016, 2018 Ricardo Wurmus <address@hidden>
+;;; Copyright © 2016, 2018, 2019 Ricardo Wurmus <address@hidden>
;;; Copyright © 2016 David Craven <address@hidden>
;;; Copyright © 2016 John Darrington <address@hidden>
;;; Copyright © 2016, 2017, 2018 Marius Bakke <address@hidden>
@@ -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
- 18/27: gnu: brdf-explorer: Unconditionally return #T from build phases., (continued)
- 18/27: gnu: brdf-explorer: Unconditionally return #T from build phases., guix-commits, 2019/01/25
- 24/27: gnu: dino: Update to 0.0-4.8e14ac6., guix-commits, 2019/01/25
- 15/27: gnu: entr: Update to 4.1., guix-commits, 2019/01/25
- 06/27: gnu: xfconf: Use INVOKE., guix-commits, 2019/01/25
- 21/27: gnu: ccl: Unconditionally return #T from build phases., guix-commits, 2019/01/25
- 17/27: gnu: ncftp: Use INVOKE., guix-commits, 2019/01/25
- 07/27: gnu: awesome: Use INVOKE., guix-commits, 2019/01/25
- 03/27: gnu: coq-gappa: Use INVOKE., guix-commits, 2019/01/25
- 01/27: gnu: eschalot: Use INVOKE., guix-commits, 2019/01/25
- 02/27: gnu: proof-general: Use INVOKE., guix-commits, 2019/01/25
- 05/27: gnu: libnl: Unconditionally return #T from build phases.,
guix-commits <=
- 08/27: gnu: wicd: Use INVOKE., guix-commits, 2019/01/25
- 04/27: gnu: coq-mathcomp: Use INVOKE., guix-commits, 2019/01/25
- 13/27: gnu: coq-coquelicot: Use INVOKE., guix-commits, 2019/01/25