[Pkg-haskell-maintainers] Bug#659530: ghc: Add ELF linker support for hurd-i386

[Samuel Thibault]

Package: ghc
Version: 7.4.1-1
Severity: normal
Tags: patch
User: debian-hurd at lists.debian.org
Usertags: hurd

Hello,

Some packages need the loadObj functionality, which is currently not
available on hurd-i386 because ghc doesn't know that it simply uses
ELF. The attached patch should fix that.

Samuel

-- System Information:
Debian Release: wheezy/sid
  APT prefers testing
  APT policy: (990, 'testing'), (500, 'unstable'), (500, 'stable'), (1, 'experimental')
Architecture: amd64 (x86_64)

Kernel: Linux 3.0.4 (SMP w/8 CPU cores)
Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash

Versions of packages ghc depends on:
ii  gcc          4:4.6.2-4
ii  libbsd-dev   0.3.0-1
ii  libc6        2.13-24
ii  libc6-dev    2.13-24
ii  libffi-dev   3.0.10-3
ii  libffi5      3.0.10-3
ii  libgmp-dev   2:5.0.2+dfsg-2
ii  libgmp10     2:5.0.2+dfsg-2
ii  libncurses5  5.9-4
ii  libtinfo5    5.9-4

ghc recommends no packages.

Versions of packages ghc suggests:
ii  ghc-doc      <none>
ii  ghc-prof     <none>
ii  haskell-doc  <none>
ii  perl         5.14.2-6

-- no debconf information

-- 
Samuel Thibault <samuel.thibault at fnac.net>
Progress (n.): The process through which the Internet has evolved from
smart people in front of dumb terminals to dumb people in front of smart
terminals.
-------------- next part --------------
--- ./rts/Linker.c.orig	2012-02-11 23:05:17.000000000 +0100
+++ ./rts/Linker.c	2012-02-11 23:10:16.000000000 +0100
@@ -74,7 +74,7 @@
     (   defined(linux_HOST_OS    ) || defined(freebsd_HOST_OS) || \
         defined(dragonfly_HOST_OS) || defined(netbsd_HOST_OS ) || \
         defined(openbsd_HOST_OS  ) || defined(darwin_HOST_OS ) || \
-        defined(kfreebsdgnu_HOST_OS) )
+        defined(kfreebsdgnu_HOST_OS) || defined(gnu_HOST_OS))
 /* Don't use mmap on powerpc_HOST_ARCH as mmap doesn't support
  * reallocating but we need to allocate jump islands just after each
  * object images. Otherwise relative branches to jump islands can fail
@@ -90,7 +90,7 @@
 
 #endif
 
-#if defined(linux_HOST_OS) || defined(solaris2_HOST_OS) || defined(freebsd_HOST_OS) || defined(kfreebsdgnu_HOST_OS) || defined(dragonfly_HOST_OS) || defined(netbsd_HOST_OS) || defined(openbsd_HOST_OS)
+#if defined(linux_HOST_OS) || defined(solaris2_HOST_OS) || defined(freebsd_HOST_OS) || defined(kfreebsdgnu_HOST_OS) || defined(dragonfly_HOST_OS) || defined(netbsd_HOST_OS) || defined(openbsd_HOST_OS) || defined(gnu_HOST_OS)
 #  define OBJFORMAT_ELF
 #  include <regex.h>    // regex is already used by dlopen() so this is OK
                         // to use here without requiring an additional lib