GNU bug report logs - #75051
[PATCH 00/14] Add loongarch64 platform support.

Previous Next

Full log

View this message in rfc822 format

From: Zheng Junjie <zhengjunjie <at> iscas.ac.cn>
To: 75051 <at> debbugs.gnu.org
Cc: Zheng Junjie <873216071 <at> qq.com>
Subject: [bug#75051] [PATCH v2 11/15] gnu: bash: Fix build to loongarch64.
Date: Sat, 25 Jan 2025 00:39:09 +0800

From: Zheng Junjie <873216071 <at> qq.com>

* gnu/packages/bash.scm (bash)[native-inputs]: When target is loongarch64, Add
config.
[arguments]: When target is loongarch64, Add update-config-scripts phase.

Change-Id: Icadaace85a62582fcb0724dda8f5067d22257cd6
---
 gnu/packages/bash.scm | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/bash.scm b/gnu/packages/bash.scm
index 642a4059852..ef530522ecb 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,9 @@ (define-public bash
      (outputs '("out"
                 "doc"                         ;1.7 MiB of HTML and extra files
                 "include"))                   ;headers used by extensions
+     (native-inputs (if (target-loongarch64?)
+                        (list config)
+                        '()))
      (inputs (list readline ncurses))             ;TODO: add texinfo
      (arguments
       `(;; When cross-compiling, `configure' incorrectly guesses that job
@@ -219,7 +223,18 @@ (define-public bash
                                             "/Makefile.inc")
                   (("^INSTALL =.*")
                    "INSTALL = install -c\n"))
-                #t))))))
+                #t)))
+          ,@(if (target-loongarch64?)
+                `((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.47.1

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.