[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
07/22: gnu: eudev: Fix cross-compilation.
From: |
guix-commits |
Subject: |
07/22: gnu: eudev: Fix cross-compilation. |
Date: |
Fri, 15 Nov 2019 11:32:44 -0500 (EST) |
mothacehe pushed a commit to branch core-updates
in repository guix.
commit 213e1764f4acf158cf470534c4c5fccfe0a92cb5
Author: Mathieu Othacehe <address@hidden>
Date: Mon Jul 8 13:41:59 2019 +0200
gnu: eudev: Fix cross-compilation.
* gnu/packages/linux.scm (eudev)[arguments]: Look for xsltproc in both
native-inputs and inputs. Also, do not run udevadm when cross-compiling.
We need to find another way to generate hwdb.bin file for cross-built
systems.
---
gnu/packages/linux.scm | 16 +++++++++++-----
1 file changed, 11 insertions(+), 5 deletions(-)
diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index ccde9d1..ed6df21 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -2620,7 +2620,7 @@ from the module-init-tools project.")
(patches (search-patches "eudev-rules-directory.patch"))))
(build-system gnu-build-system)
(arguments
- '(#:phases
+ `(#:phases
(modify-phases %standard-phases
(add-after 'unpack 'make-source-writable
(lambda _
@@ -2629,19 +2629,25 @@ from the module-init-tools project.")
(for-each make-file-writable (find-files "."))
#t))
(add-before 'bootstrap 'patch-file-names
- (lambda* (#:key inputs #:allow-other-keys)
+ (lambda* (#:key inputs native-inputs #:allow-other-keys)
(substitute* "man/make.sh"
(("/usr/bin/xsltproc")
- (string-append (assoc-ref inputs "xsltproc")
+ (string-append (assoc-ref
+ (or native-inputs inputs) "xsltproc")
"/bin/xsltproc")))
#t))
(add-after 'install 'build-hwdb
(lambda* (#:key outputs #:allow-other-keys)
;; Build OUT/etc/udev/hwdb.bin. This allows 'lsusb' and
;; similar tools to display product names.
+ ;;
+ ;; XXX: This can't be done when cross-compiling. Find another way
+ ;; to generate hwdb.bin for cross-built systems.
(let ((out (assoc-ref outputs "out")))
- (invoke (string-append out "/bin/udevadm")
- "hwdb" "--update")))))
+ ,@(if (%current-target-system)
+ '(#t)
+ '((invoke (string-append out "/bin/udevadm")
+ "hwdb" "--update")))))))
#:configure-flags (list "--enable-manpages")))
(native-inputs
`(("autoconf" ,autoconf)
- 01/22: gnu: openssl: Fix cross-compilation., (continued)
- 01/22: gnu: openssl: Fix cross-compilation., guix-commits, 2019/11/15
- 02/22: gnu: cmake: Fix cross-compilation., guix-commits, 2019/11/15
- 05/22: gnu: icu4c: Fix cross-compilation., guix-commits, 2019/11/15
- 10/22: gnu: swig: Fix cross-compilation., guix-commits, 2019/11/15
- 11/22: gnu: git: Fix cross-compilation., guix-commits, 2019/11/15
- 04/22: gnu: cyrus-sasl: Fix cross-compilation., guix-commits, 2019/11/15
- 17/22: gnu: cmake: Fix cross-compilation., guix-commits, 2019/11/15
- 13/22: gnu: guile-gcrypt: Fix cross-compilation., guix-commits, 2019/11/15
- 12/22: gnu: doxygen: Fix cross-compilation., guix-commits, 2019/11/15
- 08/22: gnu: bdb: Fix cross-compilation., guix-commits, 2019/11/15
- 07/22: gnu: eudev: Fix cross-compilation.,
guix-commits <=
- 18/22: utils: Use target-aarch64? and target-arm? helpers., guix-commits, 2019/11/15
- 15/22: gnu: libnl: Move python outputs to separate packages., guix-commits, 2019/11/15
- 09/22: gnu: openldap: Fix cross-compilation., guix-commits, 2019/11/15
- 19/22: build: vm: Fix arm32 support., guix-commits, 2019/11/15
- 21/22: system: vm: Support cross-compilation., guix-commits, 2019/11/15
- 20/22: system: vm: Add arm64 support., guix-commits, 2019/11/15
- 06/22: gnu: boost: Fix cross-compilation., guix-commits, 2019/11/15
- 22/22: scripts: system: Add --target option., guix-commits, 2019/11/15
- 16/22: gnu: crda: Fix cross-compilation, guix-commits, 2019/11/15
- 03/22: gnu: groff: Fix cross compilation., guix-commits, 2019/11/15