[DHG_packages] 01/01: ghc: only apply arm64 linker patch on arm64, to avoid conflict with armel-only patch

[Clint Adams]

This is an automated email from the git hooks/post-receive script.

clint pushed a commit to branch master
in repository DHG_packages.

commit 64033ebf40ea562da7f1b4c939e509701bfb1b7c
Author: Clint Adams <clint at debian.org>
Date:   Fri Aug 25 11:19:46 2017 -0400

    ghc: only apply arm64 linker patch on arm64, to avoid conflict with armel-only patch
---
 p/ghc/debian/changelog                                   | 7 +++++++
 p/ghc/debian/patches/{no-gold-on-arm64 => arm64-no-gold} | 0
 p/ghc/debian/patches/series                              | 1 -
 p/ghc/debian/rules                                       | 3 +++
 4 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/p/ghc/debian/changelog b/p/ghc/debian/changelog
index 7783aaa..7d5fe3e 100644
--- a/p/ghc/debian/changelog
+++ b/p/ghc/debian/changelog
@@ -1,3 +1,10 @@
+ghc (8.0.2-7) unstable; urgency=medium
+
+  * Only apply arm64 linker patch on arm64, to avoid conflict with
+    armel-only patch.
+
+ -- Clint Adams <clint at debian.org>  Fri, 25 Aug 2017 11:19:17 -0400
+
 ghc (8.0.2-6) unstable; urgency=medium
 
   * Switch arm64 linker to bfd, since gold is garbage.
diff --git a/p/ghc/debian/patches/no-gold-on-arm64 b/p/ghc/debian/patches/arm64-no-gold
similarity index 100%
rename from p/ghc/debian/patches/no-gold-on-arm64
rename to p/ghc/debian/patches/arm64-no-gold
diff --git a/p/ghc/debian/patches/series b/p/ghc/debian/patches/series
index 0d9a819..869c987 100644
--- a/p/ghc/debian/patches/series
+++ b/p/ghc/debian/patches/series
@@ -8,4 +8,3 @@ do-not-use-SHELL
 compiler-cmm-PprC-sparc-alignment.patch
 x32-use-native-x86_64-insn.patch
 osdecommitmemory-compat.patch
-no-gold-on-arm64
diff --git a/p/ghc/debian/rules b/p/ghc/debian/rules
index 1abf873..70f6514 100755
--- a/p/ghc/debian/rules
+++ b/p/ghc/debian/rules
@@ -62,6 +62,9 @@ endif
 ifeq (armel,$(DEB_HOST_ARCH))
 	patch -p1 < debian/patches/armel-revert-ghci-fixes.patch
 endif
+ifeq (arm64,$(DEB_HOST_ARCH))
+	patch -p1 < debian/patches/arm64-no-gold
+endif
 ifneq (,$(filter mips mipsel, $(DEB_HOST_ARCH)))
 	echo "SRC_HC_OPTS     += -optc--param -optcggc-min-expand=10" >> mk/build.mk
 endif

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-haskell/DHG_packages.git