* [bug#62544] [PATCH] gnu: tcsh: fix riscv64 cross-build.
@ 2023-03-30 12:32 Z572 via Guix-patches via
2023-04-06 14:47 ` bug#62544: " Ludovic Courtès
0 siblings, 1 reply; 2+ messages in thread
From: Z572 via Guix-patches via @ 2023-03-30 12:32 UTC (permalink / raw)
To: 62544
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset=y, Size: 2095 bytes --]
* gnu/packages/shells.scm(tcsh): fix riscv64 cross-build.
[arguments]<#:phase>: Add update-config-scripts phase for riscv64.
[native-inputs]: Add config for riscv64.
---
gnu/packages/shells.scm | 18 +++++++++++++++++-
1 file changed, 17 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/shells.scm b/gnu/packages/shells.scm
index c2b08afbe9..9c892f4bd2 100644
--- a/gnu/packages/shells.scm
+++ b/gnu/packages/shells.scm
@@ -20,6 +20,7 @@
;;; Copyright © 2021, 2022 Nicolas Goaziou <mail@nicolasgoaziou.fr>
;;; Copyright © 2021, 2022 Felix Gruber <felgru@posteo.net>
;;; Copyright © 2022 Andrew Tropin <andrew@trop.in>
+;;; Copyright © 2023 Zheng Junjie <873216071@qq.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -398,7 +399,10 @@ (define-public tcsh
(patch-flags '("-p0"))))
(build-system gnu-build-system)
(native-inputs
- (list autoconf perl))
+ (append (if (target-riscv64?)
+ (list config)
+ '())
+ (list autoconf perl)))
(inputs
(list ncurses))
(arguments
@@ -412,6 +416,18 @@ (define-public tcsh
"CC_FOR_GETHOST=\"gcc\""))
#t)))
'())
+ ,@(if (target-riscv64?)
+ ;; TODO: remove after commit
+ ;; 3c33503f9aec4412dc1a95927a8c5c357c7b851e or 6.24.00
+ `((add-after 'unpack 'update-config-scripts
+ (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")))))
+ '())
(add-before 'check 'patch-test-scripts
(lambda _
;; Take care of pwd
--
2.39.2
^ permalink raw reply related [flat|nested] 2+ messages in thread
* bug#62544: [PATCH] gnu: tcsh: fix riscv64 cross-build.
2023-03-30 12:32 [bug#62544] [PATCH] gnu: tcsh: fix riscv64 cross-build Z572 via Guix-patches via
@ 2023-04-06 14:47 ` Ludovic Courtès
0 siblings, 0 replies; 2+ messages in thread
From: Ludovic Courtès @ 2023-04-06 14:47 UTC (permalink / raw)
To: Z572; +Cc: 62544-done
Hi,
Z572 <873216071@qq.com> skribis:
> * gnu/packages/shells.scm(tcsh): fix riscv64 cross-build.
> [arguments]<#:phase>: Add update-config-scripts phase for riscv64.
> [native-inputs]: Add config for riscv64.
Tweaked indentation and applied it, thanks!
Ludo’.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2023-04-06 14:48 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-03-30 12:32 [bug#62544] [PATCH] gnu: tcsh: fix riscv64 cross-build Z572 via Guix-patches via
2023-04-06 14:47 ` bug#62544: " Ludovic Courtès
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.