[Pkg-haskell-commits] darcs: ghc: Explicitly depend on llv-3.0 and use corresponding binary names.

[Joachim Breitner]

Mon Jan  2 20:16:24 UTC 2012  Joachim Breitner <mail at joachim-breitner.de>
  * Explicitly depend on llv-3.0 and use corresponding binary names.
  Ignore-this: 8d0fa5a3bfe499ce1f7ff823069fbf2b

    M ./changelog +1
    M ./control -3 +3
    M ./patches/series +1
    A ./patches/use-llvm-3.0

Mon Jan  2 20:16:24 UTC 2012  Joachim Breitner <mail at joachim-breitner.de>
  * Explicitly depend on llv-3.0 and use corresponding binary names.
  Ignore-this: 8d0fa5a3bfe499ce1f7ff823069fbf2b
diff -rN -u old-ghc//changelog new-ghc//changelog
--- old-ghc//changelog	2012-02-03 16:45:03.174867276 +0000
+++ new-ghc//changelog	2012-02-03 16:45:03.803248185 +0000
@@ -10,6 +10,7 @@
   * Do not set GhcUnregisterised=YES in debian/rules, ./mk/config.mk.in
     already makes the right choice. 
   * Do not build the accidentally included dph libraries. 
+  * Explicitly depend on llv-3.0 and use corresponding binary names.
 
  -- Joachim Breitner <nomeata at debian.org>  Sat, 31 Dec 2011 21:04:19 +0100
 
diff -rN -u old-ghc//control new-ghc//control
--- old-ghc//control	2012-02-03 16:45:03.174867276 +0000
+++ new-ghc//control	2012-02-03 16:45:03.745755064 +0000
@@ -13,7 +13,7 @@
   autotools-dev,
   autoconf,
   gcc (>= 4:4.2),
-  llvm [armel armef],
+  llvm-3.0 [armel armef],
   libffi-dev,
   pkg-config,
   xsltproc,
@@ -29,12 +29,12 @@
 
 Package: ghc
 Architecture: any
-Depends: gcc (>= 4:4.2), llvm [armel armef], libgmp-dev, libffi-dev, libbsd-dev, libc6-dev, ${shlibs:Depends}, ${misc:Depends}
+Depends: gcc (>= 4:4.2), llvm-3.0 [armel armef], libgmp-dev, libffi-dev, libbsd-dev, libc6-dev, ${shlibs:Depends}, ${misc:Depends}
 Provides: haskell-compiler, ${provided-devs}, ${haskell:Provides}, ${ghci}
 Replaces: ghc6 (<< 7)
 Conflicts: ghc6 (<< 7)
 Breaks: cabal-install (<< 0.8.0), haskell-devscripts (<< 0.6.19), ghc-doc (<= 6.12.1-8)
-Suggests: perl, ghc-prof, ghc-doc, haskell-doc, llvm
+Suggests: perl, ghc-prof, ghc-doc, haskell-doc, llvm-3.0
 Description: The Glasgow Haskell Compilation system
  The Glorious Glasgow Haskell Compilation system (GHC) is a compiler for
  Haskell.
diff -rN -u old-ghc//patches/series new-ghc//patches/series
--- old-ghc//patches/series	2012-02-03 16:45:03.134858508 +0000
+++ new-ghc//patches/series	2012-02-03 16:45:03.593772529 +0000
@@ -6,3 +6,4 @@
 no_ghci_on_powerpc
 S390-Arch
 ArchMips
+use-llvm-3.0
diff -rN -u old-ghc//patches/use-llvm-3.0 new-ghc//patches/use-llvm-3.0
--- old-ghc//patches/use-llvm-3.0	1970-01-01 00:00:00.000000000 +0000
+++ new-ghc//patches/use-llvm-3.0	2012-02-03 16:45:03.701750337 +0000
@@ -0,0 +1,18 @@
+Description: Use LLVM 3.0 binaries
+ Can be done properly once http://hackage.haskell.org/trac/ghc/ticket/5739 is
+ fixed.
+Author: Joachim Breitner <nomeata at debian.org>
+Bug: http://hackage.haskell.org/trac/ghc/ticket/5739
+--- ghc-7.4.0.20111219.orig/compiler/main/SysTools.lhs
++++ ghc-7.4.0.20111219/compiler/main/SysTools.lhs
+@@ -249,8 +249,8 @@ initSysTools mbMinusB
+                 ld_args  = gcc_args
+ 
+         -- We just assume on command line
+-        ; let lc_prog = "llc"
+-              lo_prog = "opt"
++        ; let lc_prog = "llc-3.0"
++              lo_prog = "opt-3.0"
+ 
+         ; return $ Settings {
+                         sTargetPlatform = Platform {