Skip to content
GitLab
Explore
Sign in
Register
Commits on Source (2)
hslua: downgrade back to lua5.1
· 98baf538
Clint Adams
authored
Apr 26, 2018
98baf538
hslua: turn pkgconfig flag back on
· de0b929d
Clint Adams
authored
Apr 26, 2018
de0b929d
Show whitespace changes
Inline
Side-by-side
p/haskell-hslua/debian/changelog
View file @
de0b929d
haskell-hslua (0.9.5.1-5) unstable; urgency=medium
* Turn pkgconfig flag back on.
-- Clint Adams <clint@debian.org> Thu, 26 Apr 2018 10:32:15 -0400
haskell-hslua (0.9.5.1-4) unstable; urgency=medium
* Downgrade back to lua5.1.
-- Clint Adams <clint@debian.org> Thu, 26 Apr 2018 10:26:33 -0400
haskell-hslua (0.9.5.1-3) unstable; urgency=medium
* Fix Build-Depends-Indep.
...
...
p/haskell-hslua/debian/control
View file @
de0b929d
...
...
@@ -10,7 +10,7 @@ Build-Depends:
ghc (>= 8),
ghc-prof,
haskell-devscripts (>= 0.13),
liblua5.
3
-dev,
liblua5.
1
-dev,
pkg-config,
libghc-exceptions-dev (>= 0.8),
libghc-exceptions-dev (<< 0.10),
...
...
@@ -42,7 +42,7 @@ X-Description: Lua language interpreter embedding in Haskell
Package: libghc-hslua-dev
Architecture: any
Depends:
liblua5.
3
-dev,
liblua5.
1
-dev,
${haskell:Depends},
${misc:Depends},
${shlibs:Depends},
...
...
p/haskell-hslua/debian/patches/series
View file @
de0b929d
system-lua.diff
no-fail
p/haskell-hslua/debian/patches/system-lua.diff
deleted
100644 → 0
View file @
c2bc2575
--- a/hslua.cabal
+++ b/hslua.cabal
@@ -35,7 +35,7 @@
flag system-lua
description: Use the system-wide Lua instead of the bundled copy.
- default: False
+ default: True
flag apicheck
description: Compile Lua with -DLUA_USE_APICHECK.
@@ -59,7 +59,7 @@
flag luajit
description: Link with LuaJIT. This implies flag system-lua as well.
- default: False
+ default: True
flag lua501
description: Build against lua 5.1.
@@ -71,7 +71,7 @@
flag use-pkgconfig
description: Build using pkg-config to discover library and include paths. This is only used with system-lua and luajit.
- default: False
+ default: True
library
build-depends: base >= 4.7 && < 5
@@ -104,7 +104,7 @@
include-dirs: safer-api
if flag(luajit)
if flag(use-pkgconfig)
- pkgconfig-depends: luajit
+ pkgconfig-depends: luajit, lua5.1
else
Extra-libraries: luajit-5.1
else
p/haskell-hslua/debian/rules
View file @
de0b929d
#!/usr/bin/make -f
#ifeq (,$(filter $(DEB_BUILD_ARCH),amd64 armel armhf i386 mips mipsel powerpc hurd-i386 kfreebsd-i386))
DEB_SETUP_GHC_CONFIGURE_ARGS += --flags=-luajit
#else
#DEB_SETUP_GHC_CONFIGURE_ARGS += --flags=luajit
#endif
# To avoid duplicating the architecture data from debian/control, check for
# existence of luajit here. But this would do the wrong thing in a hypothetical
# unclean environment. So we do duplicate :-(
#ifeq (0,$(shell pkg-config --exists luajit; echo $$?))
#DEB_SETUP_GHC_CONFIGURE_ARGS += --flags=luajit
#else
#DEB_SETUP_GHC_CONFIGURE_ARGS += --flags=-luajit
#endif
DEB_SETUP_GHC_CONFIGURE_ARGS += --flags="system-lua lua501 use-pkgconfig"
DEB_ENABLE_TESTS = yes
...
...