[Pkg-haskell-commits] darcs: ghc: Explicitly call opt-3.4, and avoid the generic opt command.

[Joachim Breitner]

Wed Nov 26 21:11:31 UTC 2014  Joachim Breitner <mail at joachim-breitner.de>
  * Explicitly call opt-3.4, and avoid the generic opt command.

    M ./changelog +6
    M ./control -2 +2
    M ./rules -2 +2

Wed Nov 26 21:11:31 UTC 2014  Joachim Breitner <mail at joachim-breitner.de>
  * Explicitly call opt-3.4, and avoid the generic opt command.
diff -rN -u old-ghc/changelog new-ghc/changelog
--- old-ghc/changelog	2014-11-26 22:37:43.978951025 +0000
+++ new-ghc/changelog	2014-11-26 22:37:43.998951028 +0000
@@ -1,3 +1,9 @@
+ghc (7.8.20141119-3) UNRELEASED; urgency=medium
+
+  * Explicitly call opt-3.4, and avoid the generic opt command.
+
+ -- Joachim Breitner <nomeata at debian.org>  Wed, 26 Nov 2014 22:10:53 +0100
+
 ghc (7.8.20141119-2) experimental; urgency=medium
 
   * Explicitly depend on llvm-3.4 on arm, maybe that works better. 
diff -rN -u old-ghc/control new-ghc/control
--- old-ghc/control	2014-11-26 22:37:43.978951025 +0000
+++ new-ghc/control	2014-11-26 22:37:43.982951026 +0000
@@ -33,12 +33,12 @@
 
 Package: ghc
 Architecture: any
-Depends: llvm [armel armhf], gcc, libgmp-dev, libffi-dev, libbsd-dev, libc6-dev, libncurses5-dev, ${shlibs:Depends}, ${misc:Depends}
+Depends: llvm-3.4 [armel armhf], gcc, libgmp-dev, libffi-dev, libbsd-dev, libc6-dev, libncurses5-dev, ${shlibs:Depends}, ${misc:Depends}
 Provides: haskell-compiler, ${provided-devs}, ${haskell:Provides}, ${ghci}, ghc-dynamic
 Replaces: ghc6 (<< 7), ghc-dynamic (<< 7.8)
 Conflicts: ghc6 (<< 7), ghc-dynamic (<< 7.8), ${conflicting-devs}
 Breaks: cabal-install (<< 0.8.0), haskell-devscripts (<< 0.8.13), ghc-doc (<< 7.8)
-Suggests: perl, ghc-prof, ghc-doc, haskell-doc, llvm
+Suggests: perl, ghc-prof, ghc-doc, haskell-doc, llvm-3.4
 Description: The Glasgow Haskell Compilation system
  The Glorious Glasgow Haskell Compilation system (GHC) is a compiler for
  Haskell.
diff -rN -u old-ghc/rules new-ghc/rules
--- old-ghc/rules	2014-11-26 22:37:43.978951025 +0000
+++ new-ghc/rules	2014-11-26 22:37:43.994951027 +0000
@@ -114,8 +114,8 @@
 		$(EXTRA_CONFIGURE_FLAGS) \
 		--with-system-libffi \
 		--with-ld=ld.bfd \
-		--with-llc=llc \
-		--with-opt=opt
+		--with-llc=llc-3.4 \
+		--with-opt=opt-3.4
 
 	touch $@