[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
14/17: WIP: gnu: libnl: Use invoke.
From: |
Mark H. Weaver |
Subject: |
14/17: WIP: gnu: libnl: Use invoke. |
Date: |
Mon, 23 Apr 2018 03:07:29 -0400 (EDT) |
mhw pushed a commit to branch reproduce-bug-29774
in repository guix.
commit 73090ee7238befa2df5a21a8a929615798f9be55
Author: Mark H Weaver <address@hidden>
Date: Fri Mar 16 02:10:47 2018 -0400
WIP: gnu: libnl: Use invoke.
TODO: Avoid using the shell.
* gnu/packages/linux.scm (libnl)[arguments]: Use invoke and remove vestigial
result code plumbing.
---
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 a79f9ce..6b4386f 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -1437,10 +1437,7 @@ transparently through a bridge.")
("python-3" ,python-3)))
(outputs '("out" "doc" "python2" "python3"))
(arguments
- `(#:modules ((guix build gnu-build-system)
- (guix build utils)
- (srfi srfi-1))
- #:phases
+ `(#:phases
(modify-phases %standard-phases
(add-after 'install 'install-python
(lambda* (#:key outputs #:allow-other-keys)
@@ -1448,22 +1445,23 @@ transparently through a bridge.")
(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 "sh" "-c"
+ (format #f "~a ~a setup.py build"
+ ldflags python pyout))
+ (invoke "sh" "-c"
+ (format #f "~a ~a setup.py install --prefix=~a"
+ ldflags python pyout))
+ (invoke python "setup.py" "clean")))
(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
- 04/17: gnu: tracker: Use openjpeg-2., (continued)
- 04/17: gnu: tracker: Use openjpeg-2., Mark H. Weaver, 2018/04/23
- 03/17: LOCAL_ONLY: gnu: emacs: Remove imagemagick from inputs., Mark H. Weaver, 2018/04/23
- 02/17: LOCAL_ONLY: profiles: Use the canonical glibc-utf8-locales to build profiles., Mark H. Weaver, 2018/04/23
- 10/17: TEMPORARY_HACK: Disable tests for e2fsprogs., Mark H. Weaver, 2018/04/23
- 07/17: gnu: golly: More tweaks., Mark H. Weaver, 2018/04/23
- 09/17: BROKEN: gnu: e2fsprogs: Update to 1.44.1., Mark H. Weaver, 2018/04/23
- 12/17: TEMPORARY_HACK: gnu: modem-manager: Update to 1.7.991 [unstable branch!], Mark H. Weaver, 2018/04/23
- 11/17: TEMPORARY_HACK: gnu: python-pygobject: Disable tests., Mark H. Weaver, 2018/04/23
- 08/17: PRELIMINARY: Add support for hibernation., Mark H. Weaver, 2018/04/23
- 13/17: DRAFT: Fix gjs build., Mark H. Weaver, 2018/04/23
- 14/17: WIP: gnu: libnl: Use invoke.,
Mark H. Weaver <=
- 17/17: UNTESTED: records: Detect duplicate field initializers., Mark H. Weaver, 2018/04/23
- 06/17: gnu: golly: Use system lua., Mark H. Weaver, 2018/04/23
- 01/17: Merge branch 'master' into core-updates, Mark H. Weaver, 2018/04/23
- 16/17: DRAFT: gnu: vlc: Update to 3.0.1, and add more inputs., Mark H. Weaver, 2018/04/23
- 05/17: PRELIMINARY: Add celestia., Mark H. Weaver, 2018/04/23
- 15/17: WIP: gnu: Add icedove., Mark H. Weaver, 2018/04/23