[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/05: gnu: crossguid: Use INVOKE.
From: |
Tobias Geerinckx-Rice |
Subject: |
01/05: gnu: crossguid: Use INVOKE. |
Date: |
Fri, 21 Sep 2018 09:05:15 -0400 (EDT) |
nckx pushed a commit to branch master
in repository guix.
commit 2aa137e261984b9762de5221459835eefb165fe7
Author: Tobias Geerinckx-Rice <address@hidden>
Date: Fri Sep 21 13:29:38 2018 +0200
gnu: crossguid: Use INVOKE.
* gnu/packages/kodi.scm (crossguid)[arguments]: Substitute INVOKE for
SYSTEM*.
---
gnu/packages/kodi.scm | 23 ++++++++++++-----------
1 file changed, 12 insertions(+), 11 deletions(-)
diff --git a/gnu/packages/kodi.scm b/gnu/packages/kodi.scm
index 62a971a..2df5735 100644
--- a/gnu/packages/kodi.scm
+++ b/gnu/packages/kodi.scm
@@ -2,6 +2,7 @@
;;; Copyright © 2015 David Thompson <address@hidden>
;;; Copyright © 2017 Marius Bakke <address@hidden>
;;; Copyright © 2017 Oleg Pykhalov <address@hidden>
+;;; Copyright © 2018 Tobias Geerinckx-Rice <address@hidden>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -92,22 +93,22 @@
(arguments
'(#:phases
(modify-phases %standard-phases
- (delete 'configure) ; no configure script
+ (delete 'configure) ; no configure script
;; There's no build system here, so we have to do it ourselves.
(replace 'build
(lambda _
- (and (zero? (system* "g++" "-c" "guid.cpp" "-o" "guid.o"
- "-std=c++11" "-DGUID_LIBUUID"))
- (zero? (system* "ar" "rvs" "libcrossguid.a" "guid.o")))))
+ (invoke "g++" "-c" "guid.cpp" "-o" "guid.o"
+ "-std=c++11" "-DGUID_LIBUUID")
+ (invoke "ar" "rvs" "libcrossguid.a" "guid.o")))
(replace 'check
(lambda _
- (and (zero? (system* "g++" "-c" "test.cpp" "-o" "test.o"
- "-std=c++11"))
- (zero? (system* "g++" "-c" "testmain.cpp" "-o" "testmain.o"
- "-std=c++11"))
- (zero? (system* "g++" "test.o" "guid.o" "testmain.o"
- "-o" "test" "-luuid"))
- (zero? (system* (string-append (getcwd) "/test"))))))
+ (invoke "g++" "-c" "test.cpp" "-o" "test.o"
+ "-std=c++11")
+ (invoke "g++" "-c" "testmain.cpp" "-o" "testmain.o"
+ "-std=c++11")
+ (invoke "g++" "test.o" "guid.o" "testmain.o"
+ "-o" "test" "-luuid")
+ (invoke (string-append (getcwd) "/test"))))
(replace 'install
(lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")))