[Pkg-haskell-commits] darcs: ghc: Apply all hacks for armel and armhf also on arm64

[Joachim Breitner]

Thu Apr 30 07:08:36 UTC 2015  Joachim Breitner <mail at joachim-breitner.de>
  * Apply all hacks for armel and armhf also on arm64 

    M ./changelog +1
    M ./control -3 +3
    M ./rules -2 +2

Thu Apr 30 07:08:36 UTC 2015  Joachim Breitner <mail at joachim-breitner.de>
  * Apply all hacks for armel and armhf also on arm64 
diff -rN -u old-ghc/changelog new-ghc/changelog
--- old-ghc/changelog	2015-04-30 08:05:39.102685788 +0000
+++ new-ghc/changelog	2015-04-30 08:05:39.106685785 +0000
@@ -2,6 +2,7 @@
 
   * Fix debian/rules syntax (tab instead of spaces) to unbreak build on armel,
     armhf
+  * Apply all hacks for armel and armhf also on arm64 
 
  -- Joachim Breitner <nomeata at debian.org>  Thu, 30 Apr 2015 09:06:53 +0200
 
diff -rN -u old-ghc/control new-ghc/control
--- old-ghc/control	2015-04-30 08:05:39.102685788 +0000
+++ new-ghc/control	2015-04-30 08:05:39.110685781 +0000
@@ -13,13 +13,13 @@
   grep-dctrl,
   dh-autoreconf,
   autotools-dev,
-  llvm-3.4 [armel armhf],
+  llvm-3.4 [arm64 armel armhf],
   libffi-dev,
   pkg-config,
   xsltproc,
   docbook-xsl,
   docbook-xml,
-  binutils [armel armhf],
+  binutils [arm64 armel armhf],
   libncurses5-dev,
   dpkg-dev (>= 1.16.1.1)
 Build-Depends-Indep:
@@ -33,7 +33,7 @@
 
 Package: ghc
 Architecture: any
-Depends: llvm-3.4 [armel armhf], gcc, libgmp-dev, libffi-dev, libbsd-dev, libc6-dev, libncurses5-dev, ${shlibs:Depends}, ${misc:Depends}
+Depends: llvm-3.4 [arm64 armel armhf], gcc, libgmp-dev, libffi-dev, libbsd-dev, libc6-dev, libncurses5-dev, ${shlibs:Depends}, ${misc:Depends}
 Pre-Depends: dpkg (>= 1.16.1)
 Provides: haskell-compiler, ${provided-devs}, ${haskell:Provides}, ${ghci}, ghc-dynamic
 Replaces: ghc6 (<< 7), ghc-dynamic (<< 7.8)
diff -rN -u old-ghc/rules new-ghc/rules
--- old-ghc/rules	2015-04-30 08:05:39.102685788 +0000
+++ new-ghc/rules	2015-04-30 08:05:39.126685771 +0000
@@ -30,7 +30,7 @@
 #  confflags += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
 #endif
 
-ifneq (,$(findstring $(DEB_HOST_ARCH), armel armhf))
+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
@@ -208,7 +208,7 @@
 	install -Dm 644 debian/index.html debian/tmp/usr/share/doc/ghc-doc/index.html
 endif
 
-ifneq (,$(findstring $(DEB_HOST_ARCH), armel armhf))
+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) \