diff options
| author | Clint Adams <clint@debian.org> | 2015-12-17 23:07:54 -0500 |
|---|---|---|
| committer | Clint Adams <clint@debian.org> | 2015-12-17 23:07:54 -0500 |
| commit | 79ab8f2b977f24b1a17c7a36fe8e1536b4fab6f2 (patch) | |
| tree | 83fb52b292d999195984fc5578ed867bb497d820 /p/haskell-hslua/debian | |
| parent | 6815766c307195ae8a954d50bdd06c7448d29a4e (diff) | |
| download | DHG_packages-79ab8f2b977f24b1a17c7a36fe8e1536b4fab6f2.tar.gz | |
hslua: tweak system-lua patch to not force luajit on all architectures
Diffstat (limited to 'p/haskell-hslua/debian')
| -rw-r--r-- | p/haskell-hslua/debian/changelog | 6 | ||||
| -rw-r--r-- | p/haskell-hslua/debian/patches/system-lua.diff | 28 | ||||
| -rwxr-xr-x | 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 8e3ccaec7..de872dab9 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@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 e86928ea9..8000b08ba 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 01f1aaf04..90808eb5d 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 |