[DHG_packages] 13/101: Experiment with lua patches

Joachim Breitner nomeata at moszumanska.debian.org
Sun Aug 16 14:05:59 UTC 2015


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

nomeata pushed a commit to branch st3
in repository DHG_packages.

commit 0fd11aed44506e0d0f2d03ab7d3f6a34f9034ecc
Author: Joachim Breitner <mail at joachim-breitner.de>
Date:   Sat Aug 15 17:17:01 2015 +0200

    Experiment with lua patches
---
 p/haskell-hslua/debian/patches/system-lua.diff | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/p/haskell-hslua/debian/patches/system-lua.diff b/p/haskell-hslua/debian/patches/system-lua.diff
index 41a6353..e86928e 100644
--- a/p/haskell-hslua/debian/patches/system-lua.diff
+++ b/p/haskell-hslua/debian/patches/system-lua.diff
@@ -1,7 +1,7 @@
 Index: haskell-hslua/hslua.cabal
 ===================================================================
---- haskell-hslua.orig/hslua.cabal	2015-08-15 14:37:56.512810553 +0200
-+++ haskell-hslua/hslua.cabal	2015-08-15 14:39:58.063289762 +0200
+--- 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 @@
  
  flag system-lua
@@ -11,12 +11,17 @@ Index: haskell-hslua/hslua.cabal
  
  flag apicheck
    description:          Compile Lua with -DLUA_USE_APICHECK.
-@@ -49,7 +49,7 @@
-     if flag(luajit)
-       Extra-libraries:  luajit-5.1
-     else
+@@ -46,11 +46,8 @@
+   hs-source-dirs:       src
+   ghc-options:          -Wall -O2
+   if flag(system-lua)
+-    if flag(luajit)
+-      Extra-libraries:  luajit-5.1
+-    else
 -      Extra-libraries:  lua
-+      Extra-libraries:  lua5
-     includes:           lua.h
+-    includes:           lua.h
++    Pkgconfig-depends:  lua5.1
++    Pkgconfig-depends:  luajit
    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,

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



More information about the Pkg-haskell-commits mailing list