Upstream status: taken from upstream.

From a2b0f721d077fdc5c9decb21b975b58fb51a3e8f Mon Sep 17 00:00:00 2001
From: Janneke Nieuwenhuizen <janneke@gnu.org>
Date: Mon, 22 May 2023 19:21:47 +0200
Subject: [PATCH] rumpdisk: Do not assume FHS /usr/lib, fixes Guix cross-build.

---
 rumpdisk/Makefile | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/rumpdisk/Makefile b/rumpdisk/Makefile
index 60a209b3..b59aaf9a 100644
--- a/rumpdisk/Makefile
+++ b/rumpdisk/Makefile
@@ -1,5 +1,5 @@
 #
-#   Copyright (C) 2019 Free Software Foundation, Inc.
+#   Copyright (C) 2019, 2023 Free Software Foundation, Inc.
 #
 #   This program is free software; you can redistribute it and/or
 #   modify it under the terms of the GNU General Public License as
@@ -15,7 +15,6 @@
 #   along with this program; if not, write to the Free Software
 #   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-RUMPPATH=/usr/lib
 RUMPLIBS=rump rumpuser rumpdev rumpdev_disk rumpdev_pci rumpvfs rumpdev_ahcisata rumpdev_piixide rumpdev_ata
 RUMPEXTRA=rumpdev_scsipi
 
@@ -38,6 +37,6 @@ target = rumpdisk
 OBJS = $(SRCS:.c=.o)
 HURDLIBS = machdev ports trivfs shouldbeinlibc iohelp ihash fshelp
 LDLIBS += -lpthread -lpciaccess -ldl
-LDLIBS += -Wl,--whole-archive $(RUMPLIBS:%=$(RUMPPATH)/lib%_pic.a) -Wl,--no-whole-archive $(RUMPEXTRA:%=$(RUMPPATH)/lib%_pic.a)
+LDLIBS += -Wl,--whole-archive $(RUMPLIBS:%=-l%_pic) -Wl,--no-whole-archive $(RUMPEXTRA:%=-l%_pic)
 
 include ../Makeconf
-- 
2.40.1

/a></td><td class='form'><form class='right' method='get' action='/guix/log/gnu/machine/ssh.scm'>
<input type='hidden' name='id' value='b84d0b81b20a1e894d2a321c16d1bdb0979c80e3'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=b84d0b81b20a1e894d2a321c16d1bdb0979c80e3'>root</a>/<a href='/guix/log/gnu?id=b84d0b81b20a1e894d2a321c16d1bdb0979c80e3'>gnu</a>/<a href='/guix/log/gnu/machine?id=b84d0b81b20a1e894d2a321c16d1bdb0979c80e3'>machine</a>/<a href='/guix/log/gnu/machine/ssh.scm?id=b84d0b81b20a1e894d2a321c16d1bdb0979c80e3'>ssh.scm</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/gnu/machine/ssh.scm?id=b84d0b81b20a1e894d2a321c16d1bdb0979c80e3&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2022-11-17 22:27:39 +0100'>2022-11-17</span></td><td><a href='/guix/commit/gnu/machine/ssh.scm?id=17b01d546306885ff3c07e7b6aaffb541a8b9043'>machine: ssh: Validate 'system' field.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2022-10-17 07:29:09 +0200'>2022-10-17</span></td><td><a href='/guix/commit/gnu/machine/ssh.scm?id=82b0f3755d12e04578a54ee53b3a8051958e8143'>guix: Fix typos.</a><span class='msg-avail'>...</span></td><td>Julien Lepiller</td></tr>
<tr><td><span title='2022-09-26 23:29:35 +0200'>2022-09-26</span></td><td><a href='/guix/commit/gnu/machine/ssh.scm?id=1033645e9d3899edd6b052b19e24c0a718b95e88'>machine: ssh: Parameterize '%current-system' early on.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2022-03-01 10:30:17 -0500'>2022-03-01</span></td><td><a href='/guix/commit/gnu/machine/ssh.scm?id=0dc019e19a23fea614be5623360849ab9bc35e74'>initrd: Use non-hyphenated kernel command-line parameter names.</a><span class='msg-avail'>...</span></td><td>Maxim Cournoyer</td></tr>
<tr><td><span title='2022-01-16 23:56:55 +0100'>2022-01-16</span></td><td><a href='/guix/commit/gnu/machine/ssh.scm?id=084b76a70a6b302529f3450e6d07f1d105a10f7d'>machine: ssh: Add 'safety-checks?' field.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2022-01-09 23:17:17 +0100'>2022-01-09</span></td><td><a href='/guix/commit/gnu/machine/ssh.scm?id=7f20e59a13a6acc3331e04185b8f1ed2538dcd0a'>machine: ssh: Open a single SSH session per machine.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2021-06-03 13:04:20 +0200'>2021-06-03</span></td><td><a href='/guix/commit/gnu/machine/ssh.scm?id=fe509e017fa1c0e3d0b057784b081def3aa621ad'>machine: ssh: Respect calling convention for monadic procedures.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2021-06-01 23:26:07 +0200'>2021-06-01</span></td><td><a href='/guix/commit/gnu/machine/ssh.scm?id=2885c3568edec35086f8feeae5b60259cbea407c'>machine: ssh: Gracefully handle failure of the effectful bits.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>