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 af22a1ebb843acb6a7cdedd5e366308130234b87..1ec28e255a83c3d63a968a27daa9da89c65b0a79 100644 (file)
--- 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 f6c54cdaaad9ea7fdfc2be93b767194ce1b8eaf3..6dd8b4d888becae7623747a2ea2aa8c5eed08eef 100755 (executable)
--- 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 f48aa370affb64a69d5daa1f8416284315cc7ae9..bb14a11ea298e540b1bfff9c1793bcccabeeff9b 100644 (file)
--- 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 f6c54cdaaad9ea7fdfc2be93b767194ce1b8eaf3..6dd8b4d888becae7623747a2ea2aa8c5eed08eef 100755 (executable)
--- 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 \