[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
03/52: gnu: elogind: Fix cross-compilation.
From: |
guix-commits |
Subject: |
03/52: gnu: elogind: Fix cross-compilation. |
Date: |
Mon, 20 Sep 2021 07:19:26 -0400 (EDT) |
mothacehe pushed a commit to branch core-updates-frozen
in repository guix.
commit 04380925eae70f1a2f27eb09669f4ca241d3ae2a
Author: Maxime Devos <maximedevos@telenet.be>
AuthorDate: Tue Aug 24 09:33:08 2021 +0200
gnu: elogind: Fix cross-compilation.
%build-inputs and friends don't exist when cross-compiling,
so use some G-expology instead.
* gnu/packages/freedesktop.scm (elogind)[arguments]<#:configure-flags>:
Don't use '%outputs' or '%build-inputs' when cross-compiling.
---
gnu/packages/freedesktop.scm | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm
index 3d4bc63..9df7fef 100644
--- a/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@@ -583,12 +583,20 @@ the freedesktop.org XDG Base Directory specification.")
(build-system meson-build-system)
(arguments
`(#:configure-flags
- ,#~(let* ((out (assoc-ref %outputs "out"))
+ ;; TODO(core-updates): Use #$output unconditionally.
+ ,#~(let* ((out #$(if (%current-target-system)
+ #~#$output
+ #~(assoc-ref %outputs "out")))
(sysconf (string-append out "/etc"))
(libexec (string-append out "/libexec/elogind"))
(dbuspolicy (string-append out "/etc/dbus-1/system.d"))
- (shadow (assoc-ref %build-inputs "shadow"))
- (shepherd (assoc-ref %build-inputs "shepherd"))
+ ;; TODO(core-updates): use this-package-input unconditionally.
+ (shadow #$(if (%current-target-system)
+ (this-package-input "shadow")
+ #~(assoc-ref %build-inputs "shadow")))
+ (shepherd #$(if (%current-target-system)
+ (this-package-input "shepherd")
+ #~(assoc-ref %build-inputs "shepherd")))
(halt-path (string-append shepherd "/sbin/halt"))
(kexec-path "") ;not available in Guix yet
(nologin-path (string-append shadow "/sbin/nologin"))
- 34/52: gnu: libdaemon: Support cross-compilation to aarch64-linux-gnu., (continued)
- 34/52: gnu: libdaemon: Support cross-compilation to aarch64-linux-gnu., guix-commits, 2021/09/20
- 35/52: gnu: avahi: Find 'TARGET-pkg-config' when cross-compiling., guix-commits, 2021/09/20
- 28/52: gnu: heimdal: Use libcom_err from input when cross-compiling., guix-commits, 2021/09/20
- 21/52: gnu: gamin: Fix 'configure' script when cross-compiling., guix-commits, 2021/09/20
- 09/52: gnu: poppler: Find pkg-config when cross-compiling., guix-commits, 2021/09/20
- 19/52: gnu: graphene: Don't build introspection data when cross-compiling., guix-commits, 2021/09/20
- 25/52: gnu: heimdal: Refer to cross-compiled bash., guix-commits, 2021/09/20
- 15/52: gobject-introspection: Fix inputs when cross-compiling., guix-commits, 2021/09/20
- 27/52: gnu: heimdal: Find tools when cross-compiling., guix-commits, 2021/09/20
- 32/52: gnu: json-glib: Don't build introspection data when cross-compiling., guix-commits, 2021/09/20
- 03/52: gnu: elogind: Fix cross-compilation.,
guix-commits <=
- 04/52: gnu: libcap: Fix cross-compilation build failures., guix-commits, 2021/09/20
- 05/52: gnu: perl: Find 'bash' when cross-compiling., guix-commits, 2021/09/20
- 08/52: gnu: mozjs-60: Fix cross-compilation build errors., guix-commits, 2021/09/20
- 10/52: build-system/meson: Allow 'configure-flags' to be a G-exp., guix-commits, 2021/09/20
- 22/52: gnu: iso-codes: Move inputs to native-inputs when cross-compiling., guix-commits, 2021/09/20
- 14/52: gnu: gobject-introspection: Don't build introspection data when cross-compiling., guix-commits, 2021/09/20
- 20/52: gnu: gamin: Recognise aarch64 as architecture when cross-compiling., guix-commits, 2021/09/20
- 26/52: gnu: heimdal: Use the cross-compiled bash in "su"., guix-commits, 2021/09/20
- 29/52: gnu: json-glib: Add missing 'bash-minimal' input., guix-commits, 2021/09/20
- 30/52: gnu: json-glib: Find docbook inputs when cross-compiling., guix-commits, 2021/09/20