]> git.ipfire.org Git - thirdparty/pdns.git/commitdiff
dnsdist: debian: use luajit when possible 15616/head
authorChris Hofstaedtler <chris.hofstaedtler@deduktiva.com>
Mon, 2 Jun 2025 10:54:27 +0000 (12:54 +0200)
committerChris Hofstaedtler <chris.hofstaedtler@deduktiva.com>
Mon, 2 Jun 2025 13:22:07 +0000 (15:22 +0200)
Use luajit on arm64 amd64, otherwise keep lua5.3. luajit in Ubuntu jammy and
Debian bookworm should be new enough to not need version constraints anymore.

Signed-off-by: Chris Hofstaedtler <chris.hofstaedtler@deduktiva.com>
builder-support/debian/dnsdist/debian-bookworm/control
builder-support/debian/dnsdist/debian-bookworm/rules

index 3521b218b990943e3bd9c8675c7883e4d87aa245..c3b781180f2a4433ee287c4a2de535ab729b38c7 100644 (file)
@@ -13,8 +13,7 @@ Build-Depends: debhelper (>= 10),
                libfstrm-dev,
                libgnutls28-dev,
                liblmdb-dev,
-               libluajit-5.1-dev [!arm64 !s390x],
-               liblua5.3-dev [arm64 s390x],
+               libluajit-5.1-dev [amd64 arm64] | liblua5.3-dev,
                libnghttp2-dev,
                libre2-dev,
                libsnmp-dev,
index 5238445ca42bac623d1bdefc2f4c48a495969231..fa256fc615863b25e00291ad9ae52067e6a30cb9 100755 (executable)
@@ -23,8 +23,8 @@ else
 MESON_ARGS += -Dxsk=disabled
 endif
 
-# Only disable luajit on arm64
-ifneq ($(DEB_HOST_ARCH),arm64)
+# Build with luajit if it is installable
+ifneq (,$(wildcard /usr/lib/*/pkgconfig/luajit.pc))
 MESON_ARGS += -Dlua=luajit
 else
 MESON_ARGS += -Dlua=lua