TakeV/guix
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

gnu: tcsh: Fix riscv64 cross-compilation.

Browse source 
* gnu/packages/shells.scm (tcsh): fix riscv64 cross-build.
[arguments]<#:phase>: Add 'update-config-scripts' phase for riscv64.
[native-inputs]: Add CONFIG for riscv64.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
This commit is contained in:
Z572 2023-03-30 20:32:29 +08:00 committed by Maxim Cournoyer
parent aaa5c3a255
commit d496165edf
No known key found for this signature in database
GPG key ID: 1260E46482E63562
1 changed files with 17 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
gnu/packages/shells.scm
View file

@ -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