[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/05: gnu: xcb-util-renderutil: Fix cross-compiling to riscv64-linux.
From: |
guix-commits |
Subject: |
02/05: gnu: xcb-util-renderutil: Fix cross-compiling to riscv64-linux. |
Date: |
Fri, 29 Dec 2023 13:49:57 -0500 (EST) |
mothacehe pushed a commit to branch master
in repository guix.
commit c5c28df899b4c4f114bee9afd58dbde9fbbf3424
Author: Zheng Junjie <zhengjunjie@iscas.ac.cn>
AuthorDate: Thu Dec 28 22:26:21 2023 +0800
gnu: xcb-util-renderutil: Fix cross-compiling to riscv64-linux.
* gnu/packages/xorg.scm (xcb-util-renderutil)
[native-inputs]: When cross compiling to riscv64-linux-gnu, add config.
[arguments]: When target riscv64-linux-gnu, add update-config-scripts phase.
Change-Id: I906a2b7b7691ae53592cfa35ba64fc7e7d735664
Signed-off-by: Mathieu Othacehe <othacehe@gnu.org>
---
gnu/packages/xorg.scm | 22 ++++++++++++++++++++--
1 file changed, 20 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index 382075237a..4f85a5de8b 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -5675,11 +5675,29 @@ The XCB util-keysyms module provides the following
library:
"0nza1csdvvxbmk8vgv8vpmq7q8h05xrw3cfx9lwxd1hjzd47xsf6"))))
(build-system gnu-build-system)
(arguments
- '(#:configure-flags '("--disable-static")))
+ `(#:configure-flags '("--disable-static")
+ ,@(if (and (%current-target-system)
+ (target-riscv64?))
+ `(#:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'update-config-scripts
+ (lambda* (#:key inputs native-inputs #:allow-other-keys)
+ ;; Replace outdated config.guess and config.sub.
+ (for-each (lambda (file)
+ (install-file
+ (search-input-file
+ (or native-inputs inputs)
+ (string-append "/bin/" file)) "."))
+ '("config.guess" "config.sub"))))))
+ '())))
(propagated-inputs
(list libxcb))
(native-inputs
- (list pkg-config))
+ (append (if (and (%current-target-system)
+ (target-riscv64?))
+ (list config)
+ '())
+ (list pkg-config)))
(home-page "https://cgit.freedesktop.org/xcb/util-renderutil/")
(synopsis "Convenience functions for the Render extension")
(description