[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
03/08: gnu: tcsh: Fix riscv64 cross-compilation.
From: |
guix-commits |
Subject: |
03/08: gnu: tcsh: Fix riscv64 cross-compilation. |
Date: |
Thu, 6 Apr 2023 12:36:32 -0400 (EDT) |
civodul pushed a commit to branch master
in repository guix.
commit 452b2ec593405a87661362a0ff2378470d22d3de
Author: Z572 <873216071@qq.com>
AuthorDate: Thu Mar 30 20:32:29 2023 +0800
gnu: tcsh: Fix riscv64 cross-compilation.
* 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>
---
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..1ffe4ce5d8 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 @@ written by Paul Haahr and Byron Rakitzis.")
(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 @@ written by Paul Haahr and Byron Rakitzis.")
"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
- branch master updated (155db42699 -> 47fe66586e), guix-commits, 2023/04/06
- 02/08: gnu: Add avfs., guix-commits, 2023/04/06
- 03/08: gnu: tcsh: Fix riscv64 cross-compilation.,
guix-commits <=
- 01/08: gnu: pounce: Update to 3.1., guix-commits, 2023/04/06
- 05/08: gnu: janet: Update to 1.27.0., guix-commits, 2023/04/06
- 06/08: gnu: rizin: Update to 0.5.2., guix-commits, 2023/04/06
- 08/08: news: Add entry for 'guix shell --container --nesting'., guix-commits, 2023/04/06
- 07/08: environment: Add '--nesting'., guix-commits, 2023/04/06
- 04/08: gnu: libexif: Update to 0.6.24. [fixes CVE-2020-0198, CVE-2020-0452], guix-commits, 2023/04/06