From 35fd588af0679d9d442e82ba29d610a16571b393 Mon Sep 17 00:00:00 2001
From: Yelninei <yelninei@tutamail.com>
Date: Wed, 23 Jul 2025 20:17:43 +0000
Subject: [PATCH] gnu: hurd: Fix librump detection.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/hurd.scm (hurd)[#:configure-flags]: Add -Wl,--as-needed to
LDFLAGS
[#:phases]: Remove 'fixup-cross-configure phase.

Change-Id: I698461ede24c26f6a0934106408ca802ed3fc455
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
Fixes: guix/guix#1511
Merges: #1538
---
 gnu/packages/hurd.scm | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/gnu/packages/hurd.scm b/gnu/packages/hurd.scm
index af87700c86715e209045d094c7c52dc25a701de6..917870e0854010df27a2a16d62a24a2ea8e01efd 100644
--- a/gnu/packages/hurd.scm
+++ b/gnu/packages/hurd.scm
@@ -390,12 +390,6 @@ Hurd-minimal package which are needed for both glibc and GCC.")
                (("#include <rpc/pmap_prot.h>" m)
                 (string-append "#include <rpc/types.h>\n#include <rpc/xdr.h>\n" m)))
              #t))
-         ,@(if (%current-target-system)
-               '((add-after 'configure 'fixup-cross-configure
-                   (lambda _
-                     (substitute* "config.make"
-                       (("HAVE_LIBRUMP = no") "HAVE_LIBRUMP = yes")))))
-               '())
          (add-before 'build 'pre-build
            (lambda _
              ;; Don't change the ownership of any file at this time.
@@ -584,7 +578,9 @@ exec ${system}/rc \"$@\"
                          (string-append datadir "/vga-system.bdf"))))))
        #:configure-flags
        ,#~(list (string-append "LDFLAGS=-Wl,-rpath="
-                               #$output "/lib")
+                               #$output "/lib"
+                               ;; Linking with librump.so
+                               " -Wl,--as-needed")
                 "--enable-static-progs=ext2fs,iso9660fs,rumpdisk,pci-arbiter,acpi"
                 "--disable-ncursesw"
                 "--without-libbz2"