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

patches/gdm-pass-gdk-pixbuf-loader-env.patch?id=820bf78cbc487d28457acc6cb790f4cbd7cc49b9'>commit</a><a href='/guix/diff/gnu/packages/patches/gdm-pass-gdk-pixbuf-loader-env.patch?id=820bf78cbc487d28457acc6cb790f4cbd7cc49b9'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/gnu/packages/patches/gdm-pass-gdk-pixbuf-loader-env.patch'>
<input type='hidden' name='id' value='820bf78cbc487d28457acc6cb790f4cbd7cc49b9'/><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=820bf78cbc487d28457acc6cb790f4cbd7cc49b9'>root</a>/<a href='/guix/log/gnu?id=820bf78cbc487d28457acc6cb790f4cbd7cc49b9'>gnu</a>/<a href='/guix/log/gnu/packages?id=820bf78cbc487d28457acc6cb790f4cbd7cc49b9'>packages</a>/<a href='/guix/log/gnu/packages/patches?id=820bf78cbc487d28457acc6cb790f4cbd7cc49b9'>patches</a>/<a href='/guix/log/gnu/packages/patches/gdm-pass-gdk-pixbuf-loader-env.patch?id=820bf78cbc487d28457acc6cb790f4cbd7cc49b9'>gdm-pass-gdk-pixbuf-loader-env.patch</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/packages/patches/gdm-pass-gdk-pixbuf-loader-env.patch?id=820bf78cbc487d28457acc6cb790f4cbd7cc49b9&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2022-09-13 00:20:35 -0400'>2022-09-13</span></td><td><a href='/guix/commit/gnu/packages/patches/gdm-pass-gdk-pixbuf-loader-env.patch?id=97313b9b0c5d5977e66f318345523f5a2f3117e5'>gnu: gdm: Update to 42.0.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/gnome.scm (gdm): Update to 42.0.
[inputs]: Add libgudev.
* gnu/packages/patches/gdm-default-session.patch: Rebase patch.
* gnu/packages/patches/gdm-elogind-support.patch: Likewise.
* gnu/packages/patches/gdm-pass-gdk-pixbuf-loader-env.patch: Likewise.
* gnu/packages/patches/gdm-remove-hardcoded-xwayland-path.patch: Likewise.
* gnu/packages/patches/gdm-wayland-session-wrapper-from-env.patch: Likewise.
</span></span></td><td>Maxim Cournoyer</td></tr>