From 165c62208475085fdafddca29eee201bc98c3ab8 Mon Sep 17 00:00:00 2001
From: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Mon, 14 Oct 2024 00:58:18 +0200
Subject: Add GNU/Hurd kernel results

uname -s does return gnu there.

Resolves: https://github.com/mesonbuild/meson/issues/13740
Signed-off-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
---
 docs/markdown/Reference-tables.md | 1 +
 mesonbuild/environment.py         | 1 +
 mesonbuild/scripts/env2mfile.py   | 1 +
 unittests/internaltests.py        | 6 +-----
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/docs/markdown/Reference-tables.md b/docs/markdown/Reference-tables.md
index e4e964c2d..a5d0d5cdc 100644
--- a/docs/markdown/Reference-tables.md
+++ b/docs/markdown/Reference-tables.md
@@ -182,6 +182,7 @@ Native names as returned by the `.kernel()` method.
 | freebsd | |
 | openbsd | |
 | netbsd  | |
+| gnu     | GNU Hurd |
 | nt      | |
 | xnu                 | Kernel of various Apple OSes    |
 | illumos             | Kernel derived from OpenSolaris by community efforts |
diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py
index 71a2f3afc..2621b9ca2 100644
--- a/mesonbuild/environment.py
+++ b/mesonbuild/environment.py
@@ -476,6 +476,7 @@ KERNEL_MAPPINGS: T.Mapping[str, str] = {'freebsd': 'freebsd',
                                         'darwin': 'xnu',
                                         'dragonfly': 'dragonfly',
                                         'haiku': 'haiku',
+                                        'gnu': 'gnu',
                                         }
 
 def detect_kernel(system: str) -> T.Optional[str]:
diff --git a/mesonbuild/scripts/env2mfile.py b/mesonbuild/scripts/env2mfile.py
index 207d75749..b2c9a45b2 100755
--- a/mesonbuild/scripts/env2mfile.py
+++ b/mesonbuild/scripts/env2mfile.py
@@ -156,6 +156,7 @@ deb_os_map = {
 # map from DEB_HOST_ARCH_OS to Meson machine.kernel()
 deb_kernel_map = {
     'kfreebsd': 'freebsd',
+    'hurd': 'gnu',
 }
 
 def replace_special_cases(special_cases: T.Mapping[str, str], name: str) -> str:
diff --git a/unittests/internaltests.py b/unittests/internaltests.py
index 23d08e6e2..3f50ac6e0 100644
--- a/unittests/internaltests.py
+++ b/unittests/internaltests.py
@@ -1933,11 +1933,7 @@ class InternalTests(unittest.TestCase):
                     },
                     system='gnu',
                     subsystem='gnu',
-                    # TODO: Currently hurd; should match whatever happens
-                    # during native builds, but at the moment native builds
-                    # fail when kernel() is called.
-                    # https://github.com/mesonbuild/meson/issues/13740
-                    kernel='TODO',
+                    kernel='gnu',
                     cpu='i686',
                     cpu_family='x86',
                     endian='little',
-- 
cgit v1.2.3