[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
23/25: gnu: progress: Fix cross-compilation.
From: |
guix-commits |
Subject: |
23/25: gnu: progress: Fix cross-compilation. |
Date: |
Sat, 13 Jun 2020 18:49:33 -0400 (EDT) |
nckx pushed a commit to branch master
in repository guix.
commit b97b8b44ca34d2a6282dd90ab96957d650840dc5
Author: Tobias Geerinckx-Rice <me@tobias.gr>
AuthorDate: Thu Jun 11 17:42:32 2020 +0200
gnu: progress: Fix cross-compilation.
* gnu/packages/admin.scm (progress)[arguments]: Use CC-FOR-TARGET and a
target-specific pkg-config when cross-compiling.
---
gnu/packages/admin.scm | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index 9c5ab3b..d348645 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -231,8 +231,14 @@ usual file attributes can be checked for inconsistencies.")
`(("ncurses" ,ncurses)))
(arguments
`(#:tests? #f ; no test suite
- #:make-flags (list "CC=gcc"
- (string-append "PREFIX=" (assoc-ref %outputs "out")))
+ #:make-flags
+ (let ((target ,(%current-target-system)))
+ (list ,(string-append "CC=" (cc-for-target))
+ (string-append "PKG_CONFIG="
+ (if target
+ (string-append target "-pkg-config")
+ "pkg-config"))
+ (string-append "PREFIX=" (assoc-ref %outputs "out"))))
#:phases
(modify-phases %standard-phases
(delete 'configure)))) ; no configure script
- 11/25: gnu: ltris: Update to 1.0.20., (continued)
- 11/25: gnu: ltris: Update to 1.0.20., guix-commits, 2020/06/13
- 13/25: gnu: babl: Update to 0.1.78., guix-commits, 2020/06/13
- 18/25: gnu: xapian: Update to 1.4.16., guix-commits, 2020/06/13
- 15/25: gnu: gimp: Update to 2.10.20., guix-commits, 2020/06/13
- 17/25: gnu: rclone: Update to 1.52.1., guix-commits, 2020/06/13
- 19/25: gnu: python-shellingham: Update to 1.3.2., guix-commits, 2020/06/13
- 09/25: gnu: angband: Use HTTPS., guix-commits, 2020/06/13
- 20/25: gnu: evince: Update to 3.36.5., guix-commits, 2020/06/13
- 21/25: gnu: gnome-boxes: Update to 3.36.5., guix-commits, 2020/06/13
- 25/25: gnu: wesnoth: Update to 1.14.12., guix-commits, 2020/06/13
- 23/25: gnu: progress: Fix cross-compilation.,
guix-commits <=
- 12/25: gnu: libtextstyle: Update to 0.20.2., guix-commits, 2020/06/13
- 16/25: gnu: cogl: Update to 1.22.8., guix-commits, 2020/06/13
- 24/25: gnu: snd: Update to 20.4., guix-commits, 2020/06/13
- 14/25: gnu: gegl: Update to 0.4.24., guix-commits, 2020/06/13
- 22/25: gnu: s6-portable-utils: Update to 2.2.2.4., guix-commits, 2020/06/13