On 01/20/2016 10:09 AM, Joachim Breitner wrote:
> Can you provide a patch that simply checks whether libluajit-5.1-dev is
> installed, so that we don’t have this error-prone redundancy?

Maybe this could work?

--- old/haskell-hslua-0.4.1/debian/rules        2015-12-22 10:28:34.000000000 
+0100
+++ new/haskell-hslua-0.4.1/debian/rules        2016-01-20 10:25:04.224031898 
+0100
@@ -1,6 +1,6 @@
 #!/usr/bin/make -f

-ifneq (,$(filter $(DEB_BUILD_ARCH),arm64 ppc64el s390x))
+ifeq (0,$(shell dpkg -l | grep libluajit-5.1-dev | grep ^ii > /dev/null
; echo $$?))
 DEB_SETUP_GHC_CONFIGURE_ARGS += --flags=-luajit
 endif

I haven't tested it though yet, so please don't apply it right away.

Adrian

-- 
 .''`.  John Paul Adrian Glaubitz
: :' :  Debian Developer - [email protected]
`. `'   Freie Universitaet Berlin - [email protected]
  `-    GPG: 62FF 8A75 84E0 2956 9546  0006 7426 3B37 F5B5 F913
diff -Nru old/haskell-hslua-0.4.1/debian/control new/haskell-hslua-0.4.1/debian/control
--- old/haskell-hslua-0.4.1/debian/control	2016-01-19 21:21:36.000000000 +0100
+++ new/haskell-hslua-0.4.1/debian/control	2016-01-20 10:02:42.203575423 +0100
@@ -10,7 +10,7 @@
  ghc-prof,
  pkg-config,
  liblua5.1-0-dev,
- libluajit-5.1-dev [amd64 armel armhf i386 mips mipsel powerpc hurd-i386 kfreebsd-i386],
+ libluajit-5.1-dev [amd64 armel armhf i386 mips mipsel powerpc hurd-i386 kfreebsd-i386 kfreebsd-amd64],
  libghc-hspec-dev,
  libghc-hspec-contrib-dev,
  libghc-hunit-dev,
diff -Nru old/haskell-hslua-0.4.1/debian/rules new/haskell-hslua-0.4.1/debian/rules
--- old/haskell-hslua-0.4.1/debian/rules	2015-12-22 10:28:34.000000000 +0100
+++ new/haskell-hslua-0.4.1/debian/rules	2016-01-20 10:25:04.224031898 +0100
@@ -1,6 +1,6 @@
 #!/usr/bin/make -f
 
-ifneq (,$(filter $(DEB_BUILD_ARCH),arm64 ppc64el s390x))
+ifeq (0,$(shell dpkg -l | grep libluajit-5.1-dev | grep ^ii > /dev/null ; echo $$?))
 DEB_SETUP_GHC_CONFIGURE_ARGS += --flags=-luajit
 endif
 

Reply via email to