[PATCH 84/94] sys-kernel/hurd: fix libdir for cross-*

This goes back further I suppose but it only started to matter with
e244fab5adada9219d04e6b4d97d9ceeb5d17609 as otherwise we installed
just headers.

Avoids cross-i686-gnu/hurd installing to the wrong libdir:
```
/usr/i686-gnu/usr/lib64
/usr/i686-gnu/usr/lib64/libihash.a
/usr/i686-gnu/usr/lib64/libihash.so
/usr/i686-gnu/usr/lib64/libihash.so.0.3
/usr/i686-gnu/usr/lib64/libihash_pic.a
/usr/i686-gnu/usr/lib64/libirqhelp.a
/usr/i686-gnu/usr/lib64/libirqhelp.so
/usr/i686-gnu/usr/lib64/libirqhelp.so.0.3
/usr/i686-gnu/usr/lib64/libirqhelp_pic.a
/usr/i686-gnu/usr/lib64/libshouldbeinlibc.a
/usr/i686-gnu/usr/lib64/libshouldbeinlibc.so
/usr/i686-gnu/usr/lib64/libshouldbeinlibc.so.0.3
/usr/i686-gnu/usr/lib64/libshouldbeinlibc_pic.a
/usr/i686-gnu/usr/lib64/libstore.a
/usr/i686-gnu/usr/lib64/libstore.so
/usr/i686-gnu/usr/lib64/libstore.so.0.3
/usr/i686-gnu/usr/lib64/libstore_concat.a
/usr/i686-gnu/usr/lib64/libstore_copy.a
/usr/i686-gnu/usr/lib64/libstore_device.a
/usr/i686-gnu/usr/lib64/libstore_file.a
/usr/i686-gnu/usr/lib64/libstore_ileave.a
/usr/i686-gnu/usr/lib64/libstore_memobj.a
/usr/i686-gnu/usr/lib64/libstore_module.a
/usr/i686-gnu/usr/lib64/libstore_mvol.a
/usr/i686-gnu/usr/lib64/libstore_nbd.a
/usr/i686-gnu/usr/lib64/libstore_pic.a
/usr/i686-gnu/usr/lib64/libstore_remap.a
/usr/i686-gnu/usr/lib64/libstore_task.a
/usr/i686-gnu/usr/lib64/libstore_zero.a
```

Fixes: e244fab5adada9219d04e6b4d97d9ceeb5d17609
Signed-off-by: Sam James <[email protected]>
---
 sys-kernel/hurd/hurd-0.9_p20251029.ebuild | 7 ++++++-
 sys-kernel/hurd/hurd-9999.ebuild          | 7 ++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/sys-kernel/hurd/hurd-0.9_p20251029.ebuild b/sys-kernel/hurd/hurd-0.9_p20251029.ebuild
index 227596d96bb5c..ab454cfbf882c 100644
--- a/sys-kernel/hurd/hurd-0.9_p20251029.ebuild
+++ b/sys-kernel/hurd/hurd-0.9_p20251029.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit crossdev flag-o-matic
+inherit crossdev multilib flag-o-matic
 
 DESCRIPTION="GNU Hurd is the GNU project's replacement for UNIX"
 HOMEPAGE="https://www.gnu.org/software/hurd/hurd.html"
@@ -74,6 +74,11 @@ src_configure() {
 	if target_is_not_host ; then
 		local sysroot=/usr/${CTARGET}
 		export MIG="${CTARGET}-mig"
+
+		# Ensure we get compatible libdir
+		unset DEFAULT_ABI MULTILIB_ABIS
+		multilib_env
+		ABI=${DEFAULT_ABI}
 	fi
 
 	local myeconfargs=(
diff --git a/sys-kernel/hurd/hurd-9999.ebuild b/sys-kernel/hurd/hurd-9999.ebuild
index fd7d5dcc2815a..ee03564265631 100644
--- a/sys-kernel/hurd/hurd-9999.ebuild
+++ b/sys-kernel/hurd/hurd-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit crossdev flag-o-matic
+inherit crossdev multilib flag-o-matic
 
 DESCRIPTION="GNU Hurd is the GNU project's replacement for UNIX"
 HOMEPAGE="https://www.gnu.org/software/hurd/hurd.html"
@@ -73,6 +73,11 @@ src_configure() {
 	if target_is_not_host ; then
 		local sysroot=/usr/${CTARGET}
 		export MIG="${CTARGET}-mig"
+
+		# Ensure we get compatible libdir
+		unset DEFAULT_ABI MULTILIB_ABIS
+		multilib_env
+		ABI=${DEFAULT_ABI}
 	fi
 
 	local myeconfargs=(
-- 
2.53.0