[DHG_packages] 01/01: hslua: tweak system-lua patch to not force luajit on all architectures

[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 79ab8f2b977f24b1a17c7a36fe8e1536b4fab6f2
Author: Clint Adams <clint at debian.org>
Date:   Thu Dec 17 23:07:54 2015 -0500

    hslua: tweak system-lua patch to not force luajit on all architectures
---
 p/haskell-hslua/debian/changelog               |  6 ++++++
 p/haskell-hslua/debian/patches/system-lua.diff | 28 ++++++++++++++++----------
 p/haskell-hslua/debian/rules                   |  4 ++++
 3 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/p/haskell-hslua/debian/changelog b/p/haskell-hslua/debian/changelog
index 8e3ccae..de872da 100644
--- a/p/haskell-hslua/debian/changelog
+++ b/p/haskell-hslua/debian/changelog
@@ -1,3 +1,9 @@
+haskell-hslua (0.4.1-3) unstable; urgency=medium
+
+  * Tweak system-lua patch to not force luajit on all architectures.
+
+ -- Clint Adams <clint at debian.org>  Thu, 17 Dec 2015 23:00:33 -0500
+
 haskell-hslua (0.4.1-2) unstable; urgency=medium
 
   * Don't try to use luajit on [arm64,ppc64el,s390x].
diff --git a/p/haskell-hslua/debian/patches/system-lua.diff b/p/haskell-hslua/debian/patches/system-lua.diff
index e86928e..8000b08 100644
--- a/p/haskell-hslua/debian/patches/system-lua.diff
+++ b/p/haskell-hslua/debian/patches/system-lua.diff
@@ -1,8 +1,6 @@
-Index: haskell-hslua/hslua.cabal
-===================================================================
---- haskell-hslua.orig/hslua.cabal	2015-08-15 23:30:14.160921481 +0200
-+++ haskell-hslua/hslua.cabal	2015-08-15 23:39:33.232545895 +0200
-@@ -30,7 +30,7 @@
+--- a/hslua.cabal
++++ b/hslua.cabal
+@@ -31,7 +31,7 @@
  
  flag system-lua
    description:          Use the system-wide Lua instead of the bundled copy
@@ -11,17 +9,25 @@ Index: haskell-hslua/hslua.cabal
  
  flag apicheck
    description:          Compile Lua with -DLUA_USE_APICHECK.
-@@ -46,11 +46,8 @@
-   hs-source-dirs:       src
+@@ -39,7 +39,7 @@
+ 
+ flag luajit
+   description:          Link with LuaJIT (should be used with -fsystem-lua)
+-  default:              False
++  default:              True
+ 
+ library
+   build-depends:        base == 4.*, bytestring >= 0.10.2.0 && < 0.11
+@@ -48,10 +48,9 @@
    ghc-options:          -Wall -O2
    if flag(system-lua)
--    if flag(luajit)
+     if flag(luajit)
 -      Extra-libraries:  luajit-5.1
--    else
++      Pkgconfig-depends:  lua5.1, luajit
+     else
 -      Extra-libraries:  lua
 -    includes:           lua.h
-+    Pkgconfig-depends:  lua5.1
-+    Pkgconfig-depends:  luajit
++      Pkgconfig-depends:  lua5.1
    else
      c-sources:          lua-5.1.5/lobject.c, lua-5.1.5/ltm.c, lua-5.1.5/ldblib.c,
                          lua-5.1.5/ldo.c, lua-5.1.5/lvm.c, lua-5.1.5/ltable.c,
diff --git a/p/haskell-hslua/debian/rules b/p/haskell-hslua/debian/rules
index 01f1aaf..90808eb 100755
--- a/p/haskell-hslua/debian/rules
+++ b/p/haskell-hslua/debian/rules
@@ -1,5 +1,9 @@
 #!/usr/bin/make -f
 
+ifneq (,$(filter $(DEB_BUILD_ARCH),arm64 ppc64el s390x))
+DEB_SETUP_GHC_CONFIGURE_ARGS += --flags=-luajit
+endif
+
 DEB_ENABLE_TESTS = yes
 
 include /usr/share/cdbs/1/rules/debhelper.mk

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