From: Otto Moerbeek <otto.moerbeek@open-xchange.com>
Date: Mon, 2 Jun 2025 09:58:59 +0000 (+0200)
Subject: Better logic for luajit use on debian
X-Git-Tag: dnsdist-2.0.0-beta1~56^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c628d4f58ce9aadfed617af128c941279235231b;p=thirdparty%2Fpdns.git

Better logic for luajit use on debian

Signed-off-by: Otto Moerbeek <otto.moerbeek@open-xchange.com>
---

diff --git a/builder-support/debian/recursor/debian-buster/control b/builder-support/debian/recursor/debian-buster/control
index af22a1ebb8..1ec28e255a 100644
--- a/builder-support/debian/recursor/debian-buster/control
+++ b/builder-support/debian/recursor/debian-buster/control
@@ -16,7 +16,7 @@ Build-Depends: debhelper (>= 10),
                libcap-dev,
                libcurl4-openssl-dev,
                libfstrm-dev,
-               libluajit-5.1-dev (>= 2.1.0~beta3+dfsg-5.3) [amd64 arm64] | libluajit-5.1-dev [amd64] | liblua5.3-dev,
+               libluajit-5.1-dev [amd64 arm64] | liblua5.3-dev,
                libprotobuf-dev,
                libsnmp-dev,
                libsodium-dev,
diff --git a/builder-support/debian/recursor/debian-buster/rules b/builder-support/debian/recursor/debian-buster/rules
index f6c54cdaaa..6dd8b4d888 100755
--- a/builder-support/debian/recursor/debian-buster/rules
+++ b/builder-support/debian/recursor/debian-buster/rules
@@ -20,11 +20,11 @@ MESON_ARGS += -Dsystemd-service=disabled
 endif
 
 # Only disable luajit on arm64
-#ifneq ($(DEB_HOST_ARCH),arm64)
-#MESON_ARGS += -Dlua=luajit
-#else
-MESON_ARGS += -Dlua=auto
-#endif
+ifneq (,$(wildcard /usr/lib/aarch64-linux-gnu/pkgconfig/luajit.pc))
+MESON_ARGS += -Dlua=luajit
+else
+MESON_ARGS += -Dlua=lua
+endif
 
 %:
 	dh $@ --buildsystem=meson \
diff --git a/builder-support/debian/recursor/debian-trixie/control b/builder-support/debian/recursor/debian-trixie/control
index f48aa370af..bb14a11ea2 100644
--- a/builder-support/debian/recursor/debian-trixie/control
+++ b/builder-support/debian/recursor/debian-trixie/control
@@ -16,7 +16,7 @@ Build-Depends: debhelper (>= 10),
                libcap-dev,
                libcurl4-openssl-dev,
                libfstrm-dev,
-               libluajit-5.1-dev (>= 2.1.0~beta3+dfsg-5.3) [amd64 arm64] | libluajit-5.1-dev [amd64] | liblua5.3-dev,
+               libluajit-5.1-dev [amd64 arm64] | liblua5.3-dev,
                libprotobuf-dev,
                libsnmp-dev,
                libsodium-dev,
diff --git a/builder-support/debian/recursor/debian-trixie/rules b/builder-support/debian/recursor/debian-trixie/rules
index f6c54cdaaa..6dd8b4d888 100755
--- a/builder-support/debian/recursor/debian-trixie/rules
+++ b/builder-support/debian/recursor/debian-trixie/rules
@@ -20,11 +20,11 @@ MESON_ARGS += -Dsystemd-service=disabled
 endif
 
 # Only disable luajit on arm64
-#ifneq ($(DEB_HOST_ARCH),arm64)
-#MESON_ARGS += -Dlua=luajit
-#else
-MESON_ARGS += -Dlua=auto
-#endif
+ifneq (,$(wildcard /usr/lib/aarch64-linux-gnu/pkgconfig/luajit.pc))
+MESON_ARGS += -Dlua=luajit
+else
+MESON_ARGS += -Dlua=lua
+endif
 
 %:
 	dh $@ --buildsystem=meson \