[PATCH 19/94] sys-libs/glibc: link to Hurd userland libraries

Pull in Debian's patch [0] to have libc link to -llmachuser -lhurduser,
otherwise all applications would have to do it, and nobody is working
on that. I suspect that upstream will end up doing this (at least for
the time being; I plan on asking for it). It would be the same as librt
and libpthread etc anyway.

[0] https://salsa.debian.org/glibc-team/glibc/-/raw/sid/debian/patches/hurd-i386/tg-mach-hurd-link.diff

Signed-off-by: Sam James <[email protected]>
---
 .../files/glibc-2.43-hurd-link-helpers.patch  | 34 +++++++++++++++++++
 sys-libs/glibc/glibc-2.43.ebuild              |  3 ++
 sys-libs/glibc/glibc-9999.ebuild              |  3 ++
 3 files changed, 40 insertions(+)
 create mode 100644 sys-libs/glibc/files/glibc-2.43-hurd-link-helpers.patch

diff --git a/sys-libs/glibc/files/glibc-2.43-hurd-link-helpers.patch b/sys-libs/glibc/files/glibc-2.43-hurd-link-helpers.patch
new file mode 100644
index 0000000000000..24a3fc887dff7
--- /dev/null
+++ b/sys-libs/glibc/files/glibc-2.43-hurd-link-helpers.patch
@@ -0,0 +1,34 @@
+https://salsa.debian.org/glibc-team/glibc/-/raw/sid/debian/patches/hurd-i386/tg-mach-hurd-link.diff
+
+From: Samuel Thibault <[email protected]>
+Subject: [PATCH] Add -lmachuser -lhurduser to libc.so on GNU/Hurd.
+
+http://lists.gnu.org/archive/html/bug-hurd/2011-03/msg00112.html
+
+2011-03-29  Samuel Thibault  <[email protected]>
+
+        * Makerules ($(inst_libdir)/libc.so): Add -lmachuser -lhurduser to
+        libc.so on GNU/Hurd.
+
+It's still unclear what we want to aim for.
+
+---
+ Makerules | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/Makerules b/Makerules
+index 53eabfaba8..b0f5e1b3a0 100644
+--- a/Makerules
++++ b/Makerules
+@@ -1066,6 +1066,9 @@ $(inst_libdir)/libc.so: $(common-objpfx)format.lds \
+ 	      '$(libdir)/$(patsubst %,$(libtype.oS),$(libprefix)$(libc-name))'\
+ 	      ' AS_NEEDED (' $(rtlddir)/$(rtld-installed-name) ') )' \
+ 	) > [email protected]
++ifeq ($(patsubst gnu%,,$(config-os)),)
++	echo 'INPUT ( AS_NEEDED ( -lmachuser -lhurduser ) )' >> [email protected]
++endif
+ 	mv -f [email protected] $@
+ 
+ endif
+-- 
+tg: (7bb5f8a836..) t/mach-hurd-link (depends on: baseline)
diff --git a/sys-libs/glibc/glibc-2.43.ebuild b/sys-libs/glibc/glibc-2.43.ebuild
index bccbda7c68be1..24e1efff24c14 100644
--- a/sys-libs/glibc/glibc-2.43.ebuild
+++ b/sys-libs/glibc/glibc-2.43.ebuild
@@ -1010,6 +1010,9 @@ src_prepare() {
 		einfo "Applying Gentoo Glibc patchset ${patchsetname}"
 		eapply "${WORKDIR}"/patches
 		einfo "Done."
+
+		# TODO: Put into our patchset
+		eapply "${FILESDIR}"/glibc-2.43-hurd-link-helpers.patch
 	fi
 
 	case ${CTARGET} in
diff --git a/sys-libs/glibc/glibc-9999.ebuild b/sys-libs/glibc/glibc-9999.ebuild
index 874d42c4a43d3..86c64885f0080 100644
--- a/sys-libs/glibc/glibc-9999.ebuild
+++ b/sys-libs/glibc/glibc-9999.ebuild
@@ -1010,6 +1010,9 @@ src_prepare() {
 		einfo "Applying Gentoo Glibc patchset ${patchsetname}"
 		eapply "${WORKDIR}"/patches
 		einfo "Done."
+
+		# TODO: Put into our patchset
+		eapply "${FILESDIR}"/glibc-2.43-hurd-link-helpers.patch
 	fi
 
 	case ${CTARGET} in
-- 
2.53.0