[Pkg-haskell-commits] darcs: ghc: Apply hurd compatibility patch by Pino

[Joachim Breitner]

Fri May  1 06:19:14 UTC 2015  Joachim Breitner <mail at joachim-breitner.de>
  * Apply hurd compatibility patch by Pino

    M ./changelog +6
    A ./patches/hurd.diff
    M ./patches/series +1

Fri May  1 06:19:14 UTC 2015  Joachim Breitner <mail at joachim-breitner.de>
  * Apply hurd compatibility patch by Pino
diff -rN -u old-ghc/changelog new-ghc/changelog
--- old-ghc/changelog	2015-05-01 06:19:39.312661451 +0000
+++ new-ghc/changelog	2015-05-01 06:19:39.316661450 +0000
@@ -1,3 +1,9 @@
+ghc (7.8.4-4) UNRELEASED; urgency=medium
+
+  * Apply hurd compatibility patch by Pino
+
+ -- Joachim Breitner <nomeata at debian.org>  Fri, 01 May 2015 08:18:51 +0200
+
 ghc (7.8.4-3) unstable; urgency=medium
 
   * Remove LLVM path hacks, ghc-7.8 properly remembers the value passed via
diff -rN -u old-ghc/patches/hurd.diff new-ghc/patches/hurd.diff
--- old-ghc/patches/hurd.diff	1970-01-01 00:00:00.000000000 +0000
+++ new-ghc/patches/hurd.diff	2015-05-01 06:19:39.332661440 +0000
@@ -0,0 +1,43 @@
+Provided by “Pino” via Samuel Thibault. Not yet pushed upstream.
+
+Index: ghc-7.8.4/aclocal.m4
+===================================================================
+--- ghc-7.8.4.orig/aclocal.m4	2015-05-01 08:18:15.978547005 +0200
++++ ghc-7.8.4/aclocal.m4	2015-05-01 08:18:15.974546986 +0200
+@@ -271,12 +271,15 @@
+         nto-qnx)
+             test -z "[$]2" || eval "[$]2=OSQNXNTO"
+             ;;
+-        dragonfly|osf1|hpux|linuxaout|freebsd2|cygwin32|gnu|nextstep2|nextstep3|sunos4|ultrix|irix|aix)
++        dragonfly|osf1|hpux|linuxaout|freebsd2|cygwin32|nextstep2|nextstep3|sunos4|ultrix|irix|aix)
+             test -z "[$]2" || eval "[$]2=OSUnknown"
+             ;;
+         linux-android)
+             test -z "[$]2" || eval "[$]2=OSAndroid"
+             ;;
++        gnu)
++            test -z "[$]2" || eval "[$]2=OSHurd"
++            ;;
+         *)
+             echo "Unknown OS '[$]1'"
+             exit 1
+Index: ghc-7.8.4/compiler/utils/Platform.hs
+===================================================================
+--- ghc-7.8.4.orig/compiler/utils/Platform.hs	2015-05-01 08:18:15.978547005 +0200
++++ ghc-7.8.4/compiler/utils/Platform.hs	2015-05-01 08:18:15.974546986 +0200
+@@ -81,6 +81,7 @@
+         | OSOsf3
+         | OSQNXNTO
+         | OSAndroid
++        | OSHurd
+         deriving (Read, Show, Eq)
+ 
+ -- | ARM Instruction Set Architecture, Extensions and ABI
+@@ -125,6 +126,7 @@
+                                 -- per comment below it's safe
+ osElfTarget OSQNXNTO    = False
+ osElfTarget OSAndroid   = True
++osElfTarget OSHurd      = True
+ osElfTarget OSUnknown   = False
+  -- Defaulting to False is safe; it means don't rely on any
+  -- ELF-specific functionality.  It is important to have a default for
diff -rN -u old-ghc/patches/series new-ghc/patches/series
--- old-ghc/patches/series	2015-05-01 06:19:39.312661451 +0000
+++ new-ghc/patches/series	2015-05-01 06:19:39.332661440 +0000
@@ -6,3 +6,4 @@
 mips-support.patch
 saner-linker-opt-handling
 use-gold-on-arm
+hurd.diff