[Pkg-haskell-commits] darcs: ghc: Remove LLVM path hacks, ghc-7.8 properly remembers the value passed via --with-opt=opt-3.4 and use it at runtime (at least I think it does).

[Joachim Breitner]

Thu Apr 30 17:42:40 UTC 2015  Joachim Breitner <mail at joachim-breitner.de>
  * Remove LLVM path hacks, ghc-7.8 properly remembers the value passed via --with-opt=opt-3.4 and use it at runtime (at least I think it does).

    M ./changelog +7
    M ./rules -17

Thu Apr 30 17:42:40 UTC 2015  Joachim Breitner <mail at joachim-breitner.de>
  * Remove LLVM path hacks, ghc-7.8 properly remembers the value passed via --with-opt=opt-3.4 and use it at runtime (at least I think it does).
diff -rN -u old-ghc/changelog new-ghc/changelog
--- old-ghc/changelog	2015-04-30 21:00:01.247480707 +0000
+++ new-ghc/changelog	2015-04-30 21:00:01.315480709 +0000
@@ -1,3 +1,10 @@
+ghc (7.8.4-3) UNRELEASED; urgency=medium
+
+  * Remove LLVM path hacks, ghc-7.8 properly remembers the value passed via
+    --with-opt=opt-3.4 and use it at runtime (at least I think it does).
+
+ -- Joachim Breitner <nomeata at debian.org>  Thu, 30 Apr 2015 19:41:43 +0200
+
 ghc (7.8.4-2) unstable; urgency=medium
 
   * Fix debian/rules syntax (tab instead of spaces) to unbreak build on armel,
diff -rN -u old-ghc/rules new-ghc/rules
--- old-ghc/rules	2015-04-30 21:00:01.247480707 +0000
+++ new-ghc/rules	2015-04-30 21:00:01.299480709 +0000
@@ -30,13 +30,6 @@
 #  confflags += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
 #endif
 
-ifneq (,$(findstring $(DEB_HOST_ARCH), arm64 armel armhf))
-# Force use of a specific llvm package, the same version that ghc
-# depends (and build-depends) on.
-LLVM_PATH=/usr/lib/llvm-3.4/bin
-export PATH:=$(LLVM_PATH):$(PATH)
-endif
-
 ProjectVersion=$(shell cat VERSION)
 
 GHC=$(firstword $(shell bash -c "type -p ghc"))
@@ -208,16 +201,6 @@
 	install -Dm 644 debian/index.html debian/tmp/usr/share/doc/ghc-doc/index.html
 endif
 
-ifneq (,$(findstring $(DEB_HOST_ARCH), arm64 armel armhf))
-	# Ensure that the same llvm used to build ghc is used at runtime.
-	sed -i "s,exec ,PATH=\"$(LLVM_PATH):\$$PATH\"\nexport PATH\nexec ," \
-	        debian/tmp/usr/lib/ghc/bin/ghc-$(ProjectVersion) \
-	        debian/tmp/usr/lib/ghc/bin/ghc-pkg-$(ProjectVersion) \
-	        debian/tmp/usr/lib/ghc/bin/hsc2hs \
-	        debian/tmp/usr/lib/ghc/bin/haddock-ghc-$(ProjectVersion)
-endif
-
-
 	# manpages
 	rm -f debian/*.1
 	echo ".so man1/ghc.1" > debian/ghc-$(ProjectVersion).1