[Git][haskell-team/DHG_packages][experimental] ghc: Fix FTBFS on hurd-any

[Ilias Tsitsimpis (@iliastsi)]

Ilias Tsitsimpis pushed to branch experimental at Debian Haskell Group / DHG_packages


Commits:
eab449da by Ilias Tsitsimpis at 2025-11-23T09:34:55+02:00
ghc: Fix FTBFS on hurd-any

- - - - -


3 changed files:

- p/ghc/debian/changelog
- + p/ghc/debian/patches/gnu-hurd
- p/ghc/debian/patches/series


Changes:

=====================================
p/ghc/debian/changelog
=====================================
@@ -1,3 +1,10 @@
+ghc (9.10.3-1~exp4) UNRELEASED; urgency=medium
+
+  * Backport patch to fix FTBFS on hurd-any.
+    Thanks to  Samuel Thibault for the fix (Closes: #1116556).
+
+ -- Ilias Tsitsimpis <iliastsi at debian.org>  Sun, 23 Nov 2025 09:33:44 +0200
+
 ghc (9.10.3-1~exp3) experimental; urgency=medium
 
   * Switch to llvm-21, to fix build on armhf


=====================================
p/ghc/debian/patches/gnu-hurd
=====================================
@@ -0,0 +1,35 @@
+From 3939a8bf93e27d8151aa1d92bf3ce10bbbc96a72 Mon Sep 17 00:00:00 2001
+From: Samuel Thibault <samuel.thibault at ens-lyon.org>
+Date: Sun, 15 Sep 2024 15:57:52 +0200
+Subject: [PATCH] GNU/Hurd: Add getExecutablePath support
+
+GNU/Hurd exposes it as /proc/self/exe just like on Linux.
+---
+ .../src/GHC/Internal/System/Environment/ExecutablePath.hsc  | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+Index: b/libraries/ghc-internal/src/GHC/Internal/System/Environment/ExecutablePath.hsc
+===================================================================
+--- a/libraries/ghc-internal/src/GHC/Internal/System/Environment/ExecutablePath.hsc
++++ b/libraries/ghc-internal/src/GHC/Internal/System/Environment/ExecutablePath.hsc
+@@ -200,9 +200,9 @@ executablePath = Just (fmap Just getExec
+       | otherwise             = throw e
+ 
+ --------------------------------------------------------------------------------
+--- Linux / Solaris
++-- Linux / Solaris / Hurd
+ 
+-#elif defined(linux_HOST_OS) || defined(solaris2_HOST_OS)
++#elif defined(linux_HOST_OS) || defined(solaris2_HOST_OS) || defined(gnu_HOST_OS)
+ 
+ foreign import ccall unsafe "readlink"
+     c_readlink :: CString -> CString -> CSize -> IO CInt
+@@ -219,7 +219,7 @@ readSymbolicLink file =
+                    c_readlink s buf 4096
+             peekFilePathLen (buf,fromIntegral len)
+ 
+-#  if defined(linux_HOST_OS)
++#  if defined(linux_HOST_OS) || defined(gnu_HOST_OS)
+ getExecutablePath = readSymbolicLink $ "/proc/self/exe"
+ 
+ executablePath = Just (check <$> getExecutablePath) where


=====================================
p/ghc/debian/patches/series
=====================================
@@ -19,3 +19,4 @@ alpha-fix-ieee_set_fp_control-invocation.patch
 # 0005-Pass-the-mcmodel-medium-parameter-to-CC-via-GHC.patch
 hadrian-bootstrap-plan
 hadrian-unreg-template-haskell
+gnu-hurd



View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/-/commit/eab449da0c8330bf0ca6c9832ff2f3007c8fdcb5

-- 
View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/-/commit/eab449da0c8330bf0ca6c9832ff2f3007c8fdcb5
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-haskell-commits/attachments/20251123/3d8ffe1c/attachment-0001.htm>