p/ghc/debian/changelog

-ghc (8.4.3-3) UNRELEASED; urgency=medium
+ghc (8.4.3-3) experimental; urgency=medium
 
-  * Revert broken LLVM change.
+  * Switch configure.ac to search for llvm 6.0
 
- -- Clint Adams <clint@debian.org>  Wed, 18 Jul 2018 22:16:02 -0400
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Thu, 19 Jul 2018 12:16:02 +0200
 
 ghc (8.4.3-2) experimental; urgency=medium
 

p/ghc/debian/control

@@ -13,7 +13,7 @@ Build-Depends:
   pkg-config,
   ghc:native (>= 7.8),
   libgmp-dev,
-  llvm-5.0 [arm64 armel armhf],
+  llvm-6.0 [arm64 armel armhf],
   libffi-dev,
   libncurses5-dev,
   python-sphinx <!cross>,
@@ -29,7 +29,7 @@ Vcs-Browser: https://salsa.debian.org/haskell-team/DHG_packages/tree/master/p/gh
 Package: ghc
 Architecture: any
 Depends:
-  llvm-5.0 [arm64 armel armhf],
+  llvm-6.0 [arm64 armel armhf],
   gcc,
   libgmp-dev,
   libffi-dev,
@@ -51,7 +51,7 @@ Provides:
 Replaces: ghc6 (<< 7), ghc-dynamic (<< 7.8), ghc-haddock (<< 7.10)
 Conflicts: ghc6 (<< 7), ghc-dynamic (<< 7.8), libghc-cabal-dev (<< 1.24.2.1), ${conflicting-devs}
 Breaks: cabal-install (<< 1.22), haskell-devscripts (<< 0.8.13), ghc-doc (<< 7.10), ghc-haddock (<< 7.10)
-Suggests: perl, ghc-prof, ghc-doc, haskell-doc, llvm-5.0
+Suggests: perl, ghc-prof, ghc-doc, haskell-doc, llvm-6.0
 Description: The Glasgow Haskell Compilation system
  The Glorious Glasgow Haskell Compilation system (GHC) is a compiler for
  Haskell.

p/ghc/debian/patches/series

@@ -7,3 +7,4 @@ x32-use-native-x86_64-insn.patch
 use-stage1-binaries-for-install.patch
 llvm-targets-Add-versioned-ARM-targets.patch
 bsymbolic-only-for-registerised.patch
+use-llvm-6.0.patch

p/ghc/debian/patches/use-llvm-6.0.patch

+Description: Use llvm 6.0 on arm*
+Author: Gianfranco Costamagna <locutusofborg@debian.org>
+Last-Update: 2018-07-19
+
+--- ghc-8.4.3.orig/configure.ac
++++ ghc-8.4.3/configure.ac
+@@ -638,7 +638,7 @@ AC_SUBST([LibtoolCmd])
+ # tools we are looking for. In the past, GHC supported a number of
+ # versions of LLVM simultaneously, but that stopped working around
+ # 3.5/3.6 release of LLVM.
+-LlvmVersion=5.0
++LlvmVersion=6.0
+ AC_SUBST([LlvmVersion])
+ sUPPORTED_LLVM_VERSION=$(echo \($LlvmVersion\) | sed 's/\./,/')
+ AC_DEFINE_UNQUOTED([sUPPORTED_LLVM_VERSION], ${sUPPORTED_LLVM_VERSION}, [The supported LLVM version number])

p/ghc/debian/rules

@@ -126,7 +126,9 @@ endif
 	echo 'V=1'                                     >> mk/build.mk
 	./configure $(confflags) --prefix=/usr \
 		$(EXTRA_CONFIGURE_FLAGS) \
-		--with-system-libffi
+		--with-system-libffi \
+		--with-llc=llc-6.0 \
+		--with-opt=opt-6.0
 
 override_dh_auto_build:
 	dh_auto_build