[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
03/06: gnu: iniparser: Use #:make-flags.
From: |
Tobias Geerinckx-Rice |
Subject: |
03/06: gnu: iniparser: Use #:make-flags. |
Date: |
Mon, 15 Jan 2018 08:56:34 -0500 (EST) |
nckx pushed a commit to branch master
in repository guix.
commit cf52c9255d00323f4b1f11a0279aa28e0bfce624
Author: Tobias Geerinckx-Rice <address@hidden>
Date: Mon Jan 15 07:29:59 2018 +0100
gnu: iniparser: Use #:make-flags.
* gnu/packages/samba.scm (iniparser)[arguments]: Use #:make-flags to set
‘CC’ instead of patching the Makefile. Remove fruitless SYMLINK call.
---
gnu/packages/samba.scm | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/gnu/packages/samba.scm b/gnu/packages/samba.scm
index 7e00ca3..88c2df6 100644
--- a/gnu/packages/samba.scm
+++ b/gnu/packages/samba.scm
@@ -104,18 +104,19 @@ the Linux kernel CIFS client.")
"1flj7srvh2hp9ls96qz922bklyhw7f27mmn23b16839zpdjddfz0"))))
(build-system gnu-build-system)
(arguments
- `(#:phases
+ `(#:make-flags
+ (list "CC=gcc")
+ #:phases
(modify-phases %standard-phases
(replace 'configure
(lambda* (#:key outputs #:allow-other-keys)
(substitute* '("Makefile" "test/Makefile")
(("/usr/lib")
- (string-append (assoc-ref outputs "out") "/lib"))
- (("\\?= gcc") "= gcc"))))
+ (string-append (assoc-ref outputs "out") "/lib")))))
(replace 'build
- (lambda _
- (and (zero? (system* "make" "libiniparser.so"))
- (symlink "libiniparser.so.0" "libiniparser.so"))))
+ (lambda* (#:key make-flags #:allow-other-keys)
+ (apply invoke "make" "libiniparser.so"
+ make-flags)))
(replace 'install
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
- branch master updated (dd72837 -> adbfc6b), Tobias Geerinckx-Rice, 2018/01/15
- 03/06: gnu: iniparser: Use #:make-flags.,
Tobias Geerinckx-Rice <=
- 02/06: gnu: iniparser: Fix documentation directory., Tobias Geerinckx-Rice, 2018/01/15
- 01/06: gnu: ccache: Update to 3.3.5., Tobias Geerinckx-Rice, 2018/01/15
- 06/06: gnu: talloc: Update to 2.1.11., Tobias Geerinckx-Rice, 2018/01/15
- 04/06: gnu: iniparser: Use INSTALL-FILE., Tobias Geerinckx-Rice, 2018/01/15
- 05/06: gnu: iniparser: Update to 4.1., Tobias Geerinckx-Rice, 2018/01/15