--- Begin Message ---
Subject: |
[PATCH] gnu: tcsh: fix riscv64 cross-build. |
Date: |
Thu, 30 Mar 2023 20:32:29 +0800 |
* 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
--- End Message ---
--- Begin Message ---
Subject: |
Re: bug#62544: [PATCH] gnu: tcsh: fix riscv64 cross-build. |
Date: |
Thu, 06 Apr 2023 16:47:31 +0200 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) |
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’.
--- End Message ---