[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
06/06: gnu: corkscrew: Pass triplet instead of system as --build and --h
From: |
Mark H. Weaver |
Subject: |
06/06: gnu: corkscrew: Pass triplet instead of system as --build and --host. |
Date: |
Mon, 13 Jul 2015 23:12:07 +0000 |
mhw pushed a commit to branch core-updates
in repository guix.
commit 7a34576206620d61a58bca3fdcc46e1cc7669e22
Author: Mark H Weaver <address@hidden>
Date: Mon Jul 13 19:05:17 2015 -0400
gnu: corkscrew: Pass triplet instead of system as --build and --host.
This is a followup to commit 3c7d023d6458669c6bfa23bc85e098c91f699892,
"build-system/gnu: Pass --build=<triplet> to configure by default"
* gnu/packages/ssh.scm (corkscrew)[arguments]: In custom configure phase,
accept 'build' keyword argument and pass it to configure in --build
argument
and, if not cross-compiling, the --host argument. Previously, the nix
system string was passed.
---
gnu/packages/ssh.scm | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm
index 0a1a841..5d44b07 100644
--- a/gnu/packages/ssh.scm
+++ b/gnu/packages/ssh.scm
@@ -260,7 +260,7 @@ libssh library.")
'(#:phases
(alist-replace
'configure
- (lambda* (#:key outputs inputs system target
+ (lambda* (#:key outputs inputs system build target
#:allow-other-keys #:rest args)
(let* ((configure (assoc-ref %standard-phases 'configure))
(prefix (assoc-ref outputs "out"))
@@ -268,9 +268,8 @@ libssh library.")
;; Set --build and --host flags as the provided config.guess
;; is not able to detect them
(flags `(,(string-append "--prefix=" prefix)
- ,(string-append "--build=" system)
- ,(string-append "--host="
- (or target system)))))
+ ,(string-append "--build=" build)
+ ,(string-append "--host=" (or target build)))))
(setenv "CONFIG_SHELL" bash)
(zero? (apply system* bash
(string-append "." "/configure")
- branch core-updates updated (f727ec5 -> 7a34576), Mark H. Weaver, 2015/07/13
- 03/06: gnu: xbindkeys: Remove --build from configure flags., Mark H. Weaver, 2015/07/13
- 02/06: gnu: gmp: Remove --build from configure-flags., Mark H. Weaver, 2015/07/13
- 04/06: gnu: sysfsutils-1: Remove --build from configure flags., Mark H. Weaver, 2015/07/13
- 01/06: build-system/gnu: Pass --build=<triplet> to configure by default., Mark H. Weaver, 2015/07/13
- 06/06: gnu: corkscrew: Pass triplet instead of system as --build and --host.,
Mark H. Weaver <=
- 05/06: gnu: liba52: Remove --build from configure flags., Mark H. Weaver, 2015/07/13