diff options
| author | Joachim Breitner <mail@joachim-breitner.de> | 2015-04-30 20:42:40 +0300 |
|---|---|---|
| committer | Joachim Breitner <mail@joachim-breitner.de> | 2015-04-30 20:42:40 +0300 |
| commit | dc4ee41e0cfac1b0caea95cb542cc7798cab55ba (patch) | |
| tree | f3ca06cb485c09a961afd60e08c627d6e7403dff /p/ghc | |
| parent | cbb62f7ff130e9bcf8146d1c2531134082598059 (diff) | |
| download | DHG_packages-dc4ee41e0cfac1b0caea95cb542cc7798cab55ba.tar.gz | |
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).
Diffstat (limited to 'p/ghc')
| -rw-r--r-- | p/ghc/debian/changelog | 7 | ||||
| -rwxr-xr-x | p/ghc/debian/rules | 17 |
2 files changed, 7 insertions, 17 deletions
diff --git a/p/ghc/debian/changelog b/p/ghc/debian/changelog index c14d719f0..57f14db73 100644 --- a/p/ghc/debian/changelog +++ b/p/ghc/debian/changelog @@ -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@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 --git a/p/ghc/debian/rules b/p/ghc/debian/rules index f245f267b..c3bb45f2e 100755 --- a/p/ghc/debian/rules +++ b/p/ghc/debian/rules @@ -30,13 +30,6 @@ export DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH) # 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 @@ ifeq (YES,$(BUILD_HADDOCK_DOCS)) 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 |