ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2025-01-13 06:36:37 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: crossguid: Use INVOKE.

Browse source 
* gnu/packages/kodi.scm (crossguid)[arguments]: Substitute INVOKE for SYSTEM*.
This commit is contained in:
Tobias Geerinckx-Rice 2018-09-21 13:29:38 +02:00
parent e67ad5532f
commit 2aa137e261
No known key found for this signature in database
GPG key ID: 0DB0FF884F556D79
1 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
gnu/packages/kodi.scm
View file

@ -2,6 +2,7 @@
;;; Copyright © 2015 David Thompson <davet@gnu.org> ;;; Copyright © 2015 David Thompson <davet@gnu.org>
;;; Copyright © 2017 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2017 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2017 Oleg Pykhalov <go.wigust@gmail.com> ;;; Copyright © 2017 Oleg Pykhalov <go.wigust@gmail.com>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -96,18 +97,18 @@ (define-public crossguid
;; There's no build system here, so we have to do it ourselves. ;; There's no build system here, so we have to do it ourselves.
(replace 'build (replace 'build
(lambda _ (lambda _
(and (zero? (system* "g++" "-c" "guid.cpp" "-o" "guid.o" (invoke "g++" "-c" "guid.cpp" "-o" "guid.o"
"-std=c++11" "-DGUID_LIBUUID")) "-std=c++11" "-DGUID_LIBUUID")
(zero? (system* "ar" "rvs" "libcrossguid.a" "guid.o"))))) (invoke "ar" "rvs" "libcrossguid.a" "guid.o")))
(replace 'check (replace 'check
(lambda _ (lambda _
(and (zero? (system* "g++" "-c" "test.cpp" "-o" "test.o" (invoke "g++" "-c" "test.cpp" "-o" "test.o"
"-std=c++11")) "-std=c++11")
(zero? (system* "g++" "-c" "testmain.cpp" "-o" "testmain.o" (invoke "g++" "-c" "testmain.cpp" "-o" "testmain.o"
"-std=c++11")) "-std=c++11")
(zero? (system* "g++" "test.o" "guid.o" "testmain.o" (invoke "g++" "test.o" "guid.o" "testmain.o"
"-o" "test" "-luuid")) "-o" "test" "-luuid")
(zero? (system* (string-append (getcwd) "/test")))))) (invoke (string-append (getcwd) "/test"))))
(replace 'install (replace 'install
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out"))) (let ((out (assoc-ref outputs "out")))