[Pkg-haskell-commits] darcs: ghc: patches/kfreebsd-OS: KFreeBSD is an ELF-based OK

[Joachim Breitner]

Fri Dec 30 16:51:29 UTC 2011  Joachim Breitner <mail at joachim-breitner.de>
  * patches/kfreebsd-OS: KFreeBSD is an ELF-based OK
  Ignore-this: 401fce1ecdbc0520b14da41ba0fcfa68

    M ./changelog +6
    A ./patches/kfreebsd-OS
    M ./patches/series +1

Fri Dec 30 16:51:29 UTC 2011  Joachim Breitner <mail at joachim-breitner.de>
  * patches/kfreebsd-OS: KFreeBSD is an ELF-based OK
  Ignore-this: 401fce1ecdbc0520b14da41ba0fcfa68
diff -rN -u old-ghc//changelog new-ghc//changelog
--- old-ghc//changelog	2012-02-03 16:44:35.198496516 +0000
+++ new-ghc//changelog	2012-02-03 16:44:36.158258694 +0000
@@ -1,3 +1,9 @@
+ghc (7.4.0.20111219-3) UNRELEASED; urgency=low
+
+  * patches/kfreebsd-OS: KFreeBSD is an ELF-based OK
+
+ -- Joachim Breitner <nomeata at debian.org>  Fri, 30 Dec 2011 17:51:27 +0100
+
 ghc (7.4.0.20111219-2) experimental; urgency=low
 
   * Fix building bundeled haddock out-of-tree (We need to re-think this
diff -rN -u old-ghc//patches/kfreebsd-OS new-ghc//patches/kfreebsd-OS
--- old-ghc//patches/kfreebsd-OS	1970-01-01 00:00:00.000000000 +0000
+++ new-ghc//patches/kfreebsd-OS	2012-02-03 16:44:36.098254144 +0000
@@ -0,0 +1,45 @@
+From: Joachim Breitner <nomeata at debian.org>
+Description: KFreeBSD is also an ELF binary
+Bug: http://hackage.haskell.org/trac/ghc/ticket/5733
+
+Index: ghc-7.4.0.20111219/aclocal.m4
+===================================================================
+--- ghc-7.4.0.20111219.orig/aclocal.m4	2011-12-22 21:34:13.000000000 +0100
++++ ghc-7.4.0.20111219/aclocal.m4	2011-12-30 17:44:24.000000000 +0100
+@@ -221,13 +221,16 @@
+         freebsd)
+             test -z "[$]2" || eval "[$]2=OSFreeBSD"
+             ;;
++        kfreebsdgnu)
++            test -z "[$]2" || eval "[$]2=OSKFreeBSD"
++            ;;
+         openbsd)
+             test -z "[$]2" || eval "[$]2=OSOpenBSD"
+             ;;
+         netbsd)
+             test -z "[$]2" || eval "[$]2=OSNetBSD"
+             ;;
+-        dragonfly|osf1|osf3|hpux|linuxaout|kfreebsdgnu|freebsd2|cygwin32|gnu|nextstep2|nextstep3|sunos4|ultrix|irix|aix|haiku)
++        dragonfly|osf1|osf3|hpux|linuxaout|freebsd2|cygwin32|gnu|nextstep2|nextstep3|sunos4|ultrix|irix|aix|haiku)
+             test -z "[$]2" || eval "[$]2=OSUnknown"
+             ;;
+         *)
+Index: ghc-7.4.0.20111219/compiler/utils/Platform.hs
+===================================================================
+--- ghc-7.4.0.20111219.orig/compiler/utils/Platform.hs	2011-12-19 19:11:04.000000000 +0100
++++ ghc-7.4.0.20111219/compiler/utils/Platform.hs	2011-12-30 17:50:18.000000000 +0100
+@@ -56,6 +56,7 @@
+         | OSFreeBSD
+         | OSOpenBSD
+         | OSNetBSD
++        | OKKFreeBSD
+         deriving (Read, Show, Eq)
+ 
+ -- | ARM Instruction Set Architecture and Extensions
+@@ -95,5 +96,6 @@
+ osElfTarget OSSolaris2 = True
+ osElfTarget OSDarwin   = False
+ osElfTarget OSMinGW32  = False
++osElfTarget OSKFreeBSD = True
+ osElfTarget OSUnknown  = panic "Don't know if OSUnknown is elf"
+ 
diff -rN -u old-ghc//patches/series new-ghc//patches/series
--- old-ghc//patches/series	2012-02-03 16:44:35.198496516 +0000
+++ new-ghc//patches/series	2012-02-03 16:44:36.102261445 +0000
@@ -1,3 +1,4 @@
+kfreebsd-OS
 system-libffi
 haddock-hardcode-ghc-paths
 use-debian-gen_contents_index