From 33b4aa2a2fdbd7536d411688acd8462a6d0668fc Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Thu, 15 May 2014 05:29:56 +0000
Subject: [PATCH] extra/ghc to 7.8.2-4

---
 extra/ghc/PKGBUILD | 22 +++++++++++++++-------
 extra/ghc/build.mk |  2 +-
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/extra/ghc/PKGBUILD b/extra/ghc/PKGBUILD
index 5664f7840..02460feb8 100644
--- a/extra/ghc/PKGBUILD
+++ b/extra/ghc/PKGBUILD
@@ -11,14 +11,18 @@
 
 # ALARM: Kevin Mihelich <kevin@archlinuxarm.org
 #        David Flemström <david.flemstrom@gmail.com>
-#  - Add patch for vfp flags (add-vfp-flags.patch)
+#  - Patch for vfp flags (add-vfp-flags.patch)
+#  - Patch to fix dynamic linking on ARM
 #  - build.mk: BuildFlavor change from perf to perf-llvm
 #  - Add LLVM as a dependency
 #  - Correct gcc path after bulding with distcc
+#  - Use -j2 for building (RAM constraints)
+
+noautobuild=1
 
 pkgname=ghc
 pkgver=7.8.2
-pkgrel=3
+pkgrel=4
 pkgdesc='The Glasgow Haskell Compiler'
 arch=('i686' 'x86_64')
 url='http://www.haskell.org/ghc/'
@@ -27,7 +31,7 @@ depends=('perl' 'gmp' 'gcc' 'libffi' 'llvm')
 makedepends=('ghc' 'perl' 'libxslt' 'docbook-xsl')
 checkdepends=('python2')
 install='ghc.install'
-options=('staticlibs' '!makeflags')
+options=('staticlibs')
 provides=('haskell-array=0.5.0.0'
           'haskell-base=4.7.0.0'
           'haskell-binary=0.7.1.0'
@@ -82,19 +86,23 @@ source=("http://www.haskell.org/ghc/dist/${pkgver}/ghc-${pkgver}-src.tar.xz"
         "http://www.haskell.org/ghc/dist/${pkgver}/ghc-${pkgver}-testsuite.tar.xz"
         'build.mk'
         'ghc'
-        'add-vfp-flags.patch')
+        'add-vfp-flags.patch'
+        'ghc-7.8.1-mk-config.mk.in-ARM-dynlinking.patch')
 md5sums=('97578e0c27574a99e0d5071a7f35d136'
          'ac54f7fa453010149a573740705ecbfb'
-         'cb89e280f907c60791d08613f05ec049'
+         'b622685c767d0b054c92d1432708d516'
          'c1d46d86752c50dd85e7143b029fa07f'
-         '1eb0ed10fa9676c2e23a587c40166e0e')
+         '1eb0ed10fa9676c2e23a587c40166e0e'
+         '041b801ef32c45c7c9fd8d7730e79cc8')
 
 build() {
   cd ghc-${pkgver}
 
   cp ${srcdir}/build.mk mk/build.mk
 
-  patch -p1 < ${srcdir}/add-vfp-flags.patch
+  patch -p1 -i ../add-vfp-flags.patch
+  patch -p1 -Ri ../ghc-7.8.1-mk-config.mk.in-ARM-dynlinking.patch
+  MAKEFLAGS="-j2"
 
   # have to 're-boot' because the patch changes configure stuff
   ./boot
diff --git a/extra/ghc/build.mk b/extra/ghc/build.mk
index 15e33ba21..74dee6c79 100644
--- a/extra/ghc/build.mk
+++ b/extra/ghc/build.mk
@@ -58,7 +58,7 @@ endif
 
 ifeq "$(BuildFlavour)" "perf-llvm"
 
-SRC_HC_OPTS     = -O -H64m -fllvm
+SRC_HC_OPTS     = -O -H64m -fllvm -optc-mlong-calls
 GhcStage1HcOpts = -O -fllvm
 GhcStage2HcOpts = -O2 -fllvm
 GhcHcOpts       = -Rghc-timing