guix-patches
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[bug#75051] [PATCH 14/14] gnu: elfutils: Fix cross-compiling to loongarc


From: Zheng Junjie
Subject: [bug#75051] [PATCH 14/14] gnu: elfutils: Fix cross-compiling to loongarch64.
Date: Tue, 24 Dec 2024 01:14:10 +0800

* gnu/packages/elf.scm (elfutils)[native-inputs]: When cross-compiling to
loongarch64, add config.
[arguments]: When cross-compiling to loongarch64, Add update-config-scripts
phase.

Change-Id: I0a0b4faa8594ecca2344eb4b15392e4355e79e45
---
 gnu/packages/elf.scm | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/elf.scm b/gnu/packages/elf.scm
index 8f036ab2211..57d26a9f0d8 100644
--- a/gnu/packages/elf.scm
+++ b/gnu/packages/elf.scm
@@ -120,6 +120,18 @@ (define-public elfutils
                             (("run-strip-strmerge.sh") "")
                             (("run-elflint-self.sh") "")))))
                    #~())
+            #$@(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)) 
"./config"))
+                                   '("config.guess" "config.sub")))))
+                   '())
             #$@(if (system-hurd?)
                    #~((add-after 'unpack 'skip-tests
                         (lambda _
@@ -151,8 +163,10 @@ (define-public elfutils
                               (search-patch
                                "elfutils-libdwfl-string-overflow.patch"))))))
                    #~()))))
-
-    (native-inputs (list m4))
+    (native-inputs (append (if (target-loongarch64?)
+                               (list config)
+                               (list))
+                           (list m4)))
     (inputs (list xz zlib))
     (home-page "https://sourceware.org/elfutils/";)
     (synopsis "Collection of utilities and libraries to handle ELF files and
-- 
2.46.0






reply via email to

[Prev in Thread] Current Thread [Next in Thread]