[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
04/19: gnu: libsepol: Fix cross-compilation.
From: |
guix-commits |
Subject: |
04/19: gnu: libsepol: Fix cross-compilation. |
Date: |
Mon, 3 Feb 2020 09:30:24 -0500 (EST) |
mbakke pushed a commit to branch core-updates
in repository guix.
commit 7981c0be07d4e7723c263bedc5ef258d814a0ffb
Author: Marius Bakke <address@hidden>
AuthorDate: Mon Jan 27 23:06:40 2020 +0100
gnu: libsepol: Fix cross-compilation.
* gnu/packages/selinux.scm (libsepol)[arguments]: Check
for (%CURRENT-TARGET-SYSTEM) and adjust the "CC" flag accordingly.
---
gnu/packages/selinux.scm | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/selinux.scm b/gnu/packages/selinux.scm
index 49362d1..5c0cbfa 100644
--- a/gnu/packages/selinux.scm
+++ b/gnu/packages/selinux.scm
@@ -1,7 +1,7 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2016, 2017, 2018 Ricardo Wurmus <address@hidden>
;;; Copyright © 2018 Tobias Geerinckx-Rice <address@hidden>
-;;; Copyright © 2019 Marius Bakke <address@hidden>
+;;; Copyright © 2019, 2020 Marius Bakke <address@hidden>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -63,14 +63,19 @@
`(#:tests? #f ; tests require checkpolicy, which requires libsepol
#:test-target "test"
#:make-flags
- (let ((out (assoc-ref %outputs "out")))
+ (let ((out (assoc-ref %outputs "out"))
+ (target ,(%current-target-system)))
(list (string-append "PREFIX=" out)
(string-append "SHLIBDIR=" out "/lib")
(string-append "MAN3DIR=" out "/share/man/man3")
(string-append "MAN5DIR=" out "/share/man/man5")
(string-append "MAN8DIR=" out "/share/man/man8")
(string-append "LDFLAGS=-Wl,-rpath=" out "/lib")
- "CC=gcc"))
+ (string-append "CC="
+ (if target
+ (string-append (assoc-ref %build-inputs
"cross-gcc")
+ "/bin/" target "-gcc")
+ "gcc"))))
#:phases
(modify-phases %standard-phases
(delete 'configure)
- branch core-updates updated (0684a2f -> 584d08c), guix-commits, 2020/02/03
- 05/19: gnu: checkpolicy: Fix cross-compilation., guix-commits, 2020/02/03
- 02/19: gnu: llvm@3: Do not inherit 'install-opt-viewer' phase., guix-commits, 2020/02/03
- 03/19: gnu: libaio: Fix cross-compilation., guix-commits, 2020/02/03
- 06/19: gnu: RHash: Move custom configure logic to #:configure-flags., guix-commits, 2020/02/03
- 08/19: gnu: ninja: Update to 1.10.0., guix-commits, 2020/02/03
- 09/19: gnu: OpenLDAP: Update to 2.4.49., guix-commits, 2020/02/03
- 10/19: gnu: SQLite: Update to 3.31.1., guix-commits, 2020/02/03
- 14/19: gnu: pciutils: Update to 3.6.4., guix-commits, 2020/02/03
- 04/19: gnu: libsepol: Fix cross-compilation.,
guix-commits <=
- 15/19: gnu: python-pytest: Update to 5.3.5., guix-commits, 2020/02/03
- 18/19: gnu: libtasn1: Update to 4.16.0., guix-commits, 2020/02/03
- 01/19: gnu: python2-importlib-metadata: Fix circular dependency., guix-commits, 2020/02/03
- 07/19: gnu: ninja: Do not use unstable tarball., guix-commits, 2020/02/03
- 11/19: gnu: poppler: Update to 0.85.0., guix-commits, 2020/02/03
- 12/19: gnu: util-linux: Update to 2.35.1., guix-commits, 2020/02/03
- 13/19: gnu: libbsd: Do not build the static library., guix-commits, 2020/02/03
- 16/19: gnu: python-hypothesis: Update to 5.4.1., guix-commits, 2020/02/03
- 17/19: gnu: python-more-itertools: Update to 8.2.0., guix-commits, 2020/02/03
- 19/19: gnu: gnutls: Update to 3.6.12., guix-commits, 2020/02/03