From: Zheng Junjie via Guix-patches via <guix-patches@gnu.org>
To: 75051@debbugs.gnu.org
Subject: [bug#75051] [PATCH 10/14] gnu: bash: Fix cross-compiling to loongarch64.
Date: Tue, 24 Dec 2024 01:13:20 +0800 [thread overview]
Message-ID: <tencent_E3B5289B6EA9B359547F813A11E58E257E08@qq.com> (raw)
In-Reply-To: <cover.1734972657.git.873216071@qq.com>
* gnu/packages/bash.scm (bash)[native-inputs]: When cross-compiling to
loongarch64, Add config.
[arguments]: When cross-compiling to loongarch64, Add update-config-scripts
phase.
Change-Id: Icadaace85a62582fcb0724dda8f5067d22257cd6
---
gnu/packages/bash.scm | 19 ++++++++++++++++++-
1 file changed, 18 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/bash.scm b/gnu/packages/bash.scm
index 642a4059852..2d30af046ea 100644
--- a/gnu/packages/bash.scm
+++ b/gnu/packages/bash.scm
@@ -28,6 +28,7 @@
(define-module (gnu packages bash)
#:use-module ((guix licenses) #:prefix license:)
#:use-module (gnu packages)
+ #:use-module (gnu packages autotools)
#:use-module (gnu packages base)
#:use-module (gnu packages bootstrap)
#:use-module (gnu packages compression)
@@ -150,6 +151,10 @@ (define-public bash
(outputs '("out"
"doc" ;1.7 MiB of HTML and extra files
"include")) ;headers used by extensions
+ (native-inputs (if (and (target-loongarch64?)
+ (%current-target-system))
+ (list config)
+ '()))
(inputs (list readline ncurses)) ;TODO: add texinfo
(arguments
`(;; When cross-compiling, `configure' incorrectly guesses that job
@@ -219,7 +224,19 @@ (define-public bash
"/Makefile.inc")
(("^INSTALL =.*")
"INSTALL = install -c\n"))
- #t))))))
+ #t)))
+ ,@(if (and (target-loongarch64?)
+ (%current-target-system))
+ `((add-after 'unpack 'update-config-scripts
+ (lambda* (#:key inputs native-inputs #:allow-other-keys)
+ ;; Replace outdated config.guess and config.sub.
+ (for-each (lambda (file)
+ (install-file
+ (search-input-file
+ (or native-inputs inputs)
+ (string-append "/bin/" file)) "./support"))
+ '("config.guess" "config.sub")))))
+ '()))))
(native-search-paths
(list (search-path-specification ;new in 4.4
--
2.46.0
next prev parent reply other threads:[~2024-12-23 17:14 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <cover.1734972657.git.873216071@qq.com>
2024-12-23 17:05 ` [bug#75051] [PATCH 01/14] guix: Add loongarch platform Zheng Junjie via Guix-patches via
2024-12-23 17:08 ` [bug#75051] [PATCH 02/14] utils: Add target-loongarch64? Zheng Junjie via Guix-patches via
2024-12-23 17:08 ` [bug#75051] [PATCH 03/14] gnu: Add linux-libre-headers-5.19.17 Zheng Junjie via Guix-patches via
2024-12-23 17:10 ` [bug#75051] [PATCH 04/14] gnu: cross-base: Add cross-compiling support for loongarch64 Zheng Junjie via Guix-patches via
2024-12-23 17:11 ` [bug#75051] [PATCH 05/14] gnu: %glibc-stripped: Fix cross-compiling to loongarch64 Zheng Junjie via Guix-patches via
2024-12-23 17:12 ` [bug#75051] [PATCH 06/14] gnu: openssl: Support loongarch64 Zheng Junjie via Guix-patches via
2024-12-23 17:12 ` [bug#75051] [PATCH 07/14] gnu: readline: Fix cross-compiling to loongarch64 Zheng Junjie via Guix-patches via
2024-12-23 17:13 ` [bug#75051] [PATCH 08/14] gnu: gdbm: " Zheng Junjie via Guix-patches via
2024-12-23 17:13 ` [bug#75051] [PATCH 09/14] gnu: libatomic-ops: " Zheng Junjie via Guix-patches via
2024-12-23 17:13 ` Zheng Junjie via Guix-patches via [this message]
2024-12-23 17:13 ` [bug#75051] [PATCH 11/14] gnu: sed: " Zheng Junjie via Guix-patches via
2024-12-23 17:13 ` [bug#75051] [PATCH 12/14] gnu: isl: " Zheng Junjie via Guix-patches via
2024-12-23 17:13 ` [bug#75051] [PATCH 13/14] gnu: pcre2: disable jit on loongarch64 Zheng Junjie via Guix-patches via
2024-12-23 17:14 ` [bug#75051] [PATCH 14/14] gnu: elfutils: Fix cross-compiling to loongarch64 Zheng Junjie via Guix-patches via
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
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=tencent_E3B5289B6EA9B359547F813A11E58E257E08@qq.com \
--to=guix-patches@gnu.org \
--cc=75051@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 public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).