diff options
| author | Joachim Breitner <mail@joachim-breitner.de> | 2016-01-20 11:18:56 +0100 |
|---|---|---|
| committer | Joachim Breitner <mail@joachim-breitner.de> | 2016-01-20 11:26:03 +0100 |
| commit | e379976b5a9f0759dc49641b6c3f11ed6faa7d61 (patch) | |
| tree | c31746b99329a79557a876404e4494f2c2fe3dd1 | |
| parent | 02fb148abd77c0fd5e344f100e062daa78eacfee (diff) | |
| download | DHG_packages-e379976b5a9f0759dc49641b6c3f11ed6faa7d61.tar.gz | |
hslua: In debian/rules list architectures
| -rw-r--r-- | p/haskell-hslua/debian/changelog | 7 | ||||
| -rwxr-xr-x | p/haskell-hslua/debian/rules | 13 |
2 files changed, 19 insertions, 1 deletions
diff --git a/p/haskell-hslua/debian/changelog b/p/haskell-hslua/debian/changelog index 97258c39f..24361d93d 100644 --- a/p/haskell-hslua/debian/changelog +++ b/p/haskell-hslua/debian/changelog @@ -1,3 +1,10 @@ +haskell-hslua (0.4.1-6) unstable; urgency=medium + + * Update architecture whitelist in debian/rules for luajit use, again + closes: #811554. Thanks to Adrian Glaubitz for the patch. + + -- Joachim Breitner <nomeata@debian.org> Wed, 20 Jan 2016 11:18:32 +0100 + haskell-hslua (0.4.1-5) unstable; urgency=medium * Use a whitelist for the libluajit-5.1-dev dependency (Closes: #811554) diff --git a/p/haskell-hslua/debian/rules b/p/haskell-hslua/debian/rules index 90808eb5d..28a9181ee 100755 --- a/p/haskell-hslua/debian/rules +++ b/p/haskell-hslua/debian/rules @@ -1,9 +1,20 @@ #!/usr/bin/make -f -ifneq (,$(filter $(DEB_BUILD_ARCH),arm64 ppc64el s390x)) +ifeq (,$(filter $(DEB_BUILD_ARCH),amd64 armel armhf i386 mips mipsel powerpc hurd-i386 kfreebsd-i386 kfreebsd-amd64)) 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_ENABLE_TESTS = yes include /usr/share/cdbs/1/rules/debhelper.mk |