From: Z572 via Guix-patches via <guix-patches@gnu.org>
To: 61865@debbugs.gnu.org
Subject: [bug#61865] [PATCH] gnu: libxtst: fix riscv64 cross-compile.
Date: Thu, 30 Mar 2023 22:46:03 +0800 [thread overview]
Message-ID: <tencent_1FB884A0367A1335153AABE7EF4147A17C05@qq.com> (raw)
In-Reply-To: <tencent_28F759357FC83A91E5B5254BB5D29B3AA908@qq.com>
* gnu/packages/xorg.scm(libxtst): fix riscv64 cross-compile
[arguments]: when target is riscv64, add phase to update config.{guess,sub}
[native-inputs]: when target is riscv64, add config.
---
gnu/packages/xorg.scm | 21 ++++++++++++++++++---
1 file changed, 18 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index 55c9b53e1d..7d5e7c6f9c 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -4509,13 +4509,28 @@ (define-public libxtst
"012jpyj7xfm653a9jcfqbzxyywdmwb2b5wr1dwylx14f3f54jma6"))))
(build-system gnu-build-system)
(arguments
- '(#:configure-flags '("--disable-static")))
+ `(#:configure-flags '("--disable-static")
+ ,@(if (target-riscv64?)
+ `(#:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'update-config
+ (lambda* (#:key native-inputs inputs #:allow-other-keys)
+ (for-each (lambda (file)
+ (install-file
+ (search-input-file
+ (or native-inputs inputs)
+ (string-append "/bin/" file)) "."))
+ '("config.guess" "config.sub"))))))
+ '())))
(propagated-inputs
(list libxi xorgproto))
(inputs
- (list libx11))
+ (list libx11))
(native-inputs
- (list pkg-config))
+ `(,@(if (target-riscv64?)
+ (list config)
+ '())
+ ,pkg-config))
(home-page "https://www.x.org/wiki/")
(synopsis "Xorg library for Xtest and Record extensions")
(description
--
2.39.2
next prev parent reply other threads:[~2023-03-30 14:47 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-28 8:30 [bug#61865] [PATCH 0/8] fix some packages cross-compile Z572 via Guix-patches via
2023-03-30 14:46 ` Z572 via Guix-patches via [this message]
2023-06-04 12:19 ` [bug#61865] [PATCH] gnu: libxtst: fix riscv64 cross-compile Efraim Flashner
2023-06-04 12:20 ` bug#61865: [PATCH 0/8] fix some packages cross-compile Efraim Flashner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=tencent_1FB884A0367A1335153AABE7EF4147A17C05@qq.com \
--to=guix-patches@gnu.org \
--cc=61865@debbugs.gnu.org \
--cc=873216071@qq.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.