builder-support: Disable luajit usage on aarch64 Debian/Ubuntu builds

The luajit package is currently not compatible with the aarch64 architecture,
so when Debian or Ubuntu packages are built for that architecture, use lua5.3
instead.

Signed-off-by: Kevin P. Fleming <kevin@km6g.us>

diff --git a/builder-support/debian/authoritative/debian-buster/control b/builder-support/debian/authoritative/debian-buster/control
index a11956d9064c57593deaa91a057b3a4b8ebdabdb..4e64ed676da35d5145b165c813f9a37fd3f10d47 100644 (file)
--- a/builder-support/debian/authoritative/debian-buster/control
+++ b/builder-support/debian/authoritative/debian-buster/control
@@ -24,7 +24,8 @@ Build-Depends: autoconf,
                libkrb5-dev,
                libldap2-dev,
                liblmdb-dev,
-               libluajit-5.1-dev,
+               libluajit-5.1-dev [!arm64],
+               liblua5.3-dev [arm64],
                libmaxminddb-dev,
                libp11-kit-dev,
                libpq-dev,

diff --git a/builder-support/debian/authoritative/debian-buster/rules b/builder-support/debian/authoritative/debian-buster/rules
index 22779b1756700d3eeec729fa65c2e01f67d41621..600e7412b7fe9f5522042961b47fd342ee60c10a 100755 (executable)
--- a/builder-support/debian/authoritative/debian-buster/rules
+++ b/builder-support/debian/authoritative/debian-buster/rules
@@ -19,6 +19,13 @@ else
 CONFIGURE_ARGS += --disable-systemd
 endif
 
+# Only disable luajit on arm64
+ifneq ($(DEB_HOST_ARCH),arm64)
+CONFIGURE_ARGS += --with-lua=luajit
+else
+CONFIGURE_ARGS += --with-lua=lua5.3
+endif
+
 # Use new build system
 %:
        dh $@ \

diff --git a/builder-support/debian/authoritative/debian-stretch/control b/builder-support/debian/authoritative/debian-stretch/control
index a11956d9064c57593deaa91a057b3a4b8ebdabdb..4e64ed676da35d5145b165c813f9a37fd3f10d47 100644 (file)
--- a/builder-support/debian/authoritative/debian-stretch/control
+++ b/builder-support/debian/authoritative/debian-stretch/control
@@ -24,7 +24,8 @@ Build-Depends: autoconf,
                libkrb5-dev,
                libldap2-dev,
                liblmdb-dev,
-               libluajit-5.1-dev,
+               libluajit-5.1-dev [!arm64],
+               liblua5.3-dev [arm64],
                libmaxminddb-dev,
                libp11-kit-dev,
                libpq-dev,

diff --git a/builder-support/debian/authoritative/debian-stretch/rules b/builder-support/debian/authoritative/debian-stretch/rules
index 14bbc43c412870e1bd6cdface3c0230c9a946aa6..221f7a98779a09bb956650f52ed2502df7294258 100755 (executable)
--- a/builder-support/debian/authoritative/debian-stretch/rules
+++ b/builder-support/debian/authoritative/debian-stretch/rules
@@ -19,6 +19,12 @@ else
 CONFIGURE_ARGS += --disable-systemd
 endif
 
+# Only disable luajit on arm64
+ifneq ($(DEB_HOST_ARCH),arm64)
+CONFIGURE_ARGS += --with-lua=luajit
+else
+CONFIGURE_ARGS += --with-lua=lua5.3
+endif
 
 # Use new build system
 %:
@@ -34,7 +40,6 @@ override_dh_auto_configure:
                --with-modules="" \
                --enable-tools \
                --with-libsodium \
-               --with-lua=luajit \
                --with-protobuf \
                --enable-unit-tests \
                --enable-experimental-pkcs11 \

diff --git a/builder-support/debian/dnsdist/debian-buster/control b/builder-support/debian/dnsdist/debian-buster/control
index 0e2f77ba4ba03906e6108e5d246f1eae1018f24e..3467f11e896ec3e5b0454e103c79b90107c9e449 100644 (file)
--- a/builder-support/debian/dnsdist/debian-buster/control
+++ b/builder-support/debian/dnsdist/debian-buster/control
@@ -12,7 +12,8 @@ Build-Depends: debhelper (>= 10),
                libgnutls28-dev,
                libh2o-evloop-dev,
                liblmdb-dev,
-               libluajit-5.1-dev,
+               libluajit-5.1-dev [!arm64],
+               liblua5.3-dev [arm64],
                libprotobuf-dev,
                libre2-dev,
                libsnmp-dev,

diff --git a/builder-support/debian/dnsdist/debian-buster/rules b/builder-support/debian/dnsdist/debian-buster/rules
index 71b1950e125771ae47c269ca678b4c4b69653913..2f2d0e303e14b789b3978a5096f497e62d9176ac 100755 (executable)
--- a/builder-support/debian/dnsdist/debian-buster/rules
+++ b/builder-support/debian/dnsdist/debian-buster/rules
@@ -19,6 +19,12 @@ else
 CONFIGURE_ARGS += --disable-systemd
 endif
 
+# Only disable luajit on arm64
+ifneq ($(DEB_HOST_ARCH),arm64)
+CONFIGURE_ARGS += --with-lua=luajit
+else
+CONFIGURE_ARGS += --with-lua=lua5.3
+endif
 
 %:
        dh $@ \
@@ -51,7 +57,6 @@ override_dh_auto_configure:
          --with-libsodium \
          --with-re2 \
          --with-ebpf \
-         --with-lua=luajit \
          --with-protobuf \
          --with-service-user='_dnsdist' \
          --with-service-group='_dnsdist' \

diff --git a/builder-support/debian/dnsdist/debian-stretch/control b/builder-support/debian/dnsdist/debian-stretch/control
index fc4fe07e158b0587ea0a402fe89bccf82f3f30c4..63d7b00f4174a9b0887bbd84ea13d4e47136e6bc 100644 (file)
--- a/builder-support/debian/dnsdist/debian-stretch/control
+++ b/builder-support/debian/dnsdist/debian-stretch/control
@@ -11,7 +11,8 @@ Build-Depends: debhelper (>= 10),
                libfstrm-dev,
                libgnutls28-dev,
                liblmdb-dev,
-               libluajit-5.1-dev,
+               libluajit-5.1-dev [!arm64],
+               liblua5.3-dev [arm64],
                libprotobuf-dev,
                libre2-dev,
                libsodium-dev,

diff --git a/builder-support/debian/dnsdist/debian-stretch/rules b/builder-support/debian/dnsdist/debian-stretch/rules
index d255665a09c8312614d45a5f6a35489257eb9941..55eebc3dcfcb3c63d70bb3d5bd6618ebdd79681b 100755 (executable)
--- a/builder-support/debian/dnsdist/debian-stretch/rules
+++ b/builder-support/debian/dnsdist/debian-stretch/rules
@@ -19,6 +19,12 @@ else
 CONFIGURE_ARGS += --disable-systemd
 endif
 
+# Only disable luajit on arm64
+ifneq ($(DEB_HOST_ARCH),arm64)
+CONFIGURE_ARGS += --with-lua=luajit
+else
+CONFIGURE_ARGS += --with-lua=lua5.3
+endif
 
 %:
        dh $@ \
@@ -50,7 +56,6 @@ override_dh_auto_configure:
          --with-libsodium \
          --with-re2 \
          --with-ebpf \
-         --with-lua=luajit \
          --with-protobuf \
          --with-service-user='_dnsdist' \
          --with-service-group='_dnsdist' \

diff --git a/builder-support/debian/recursor/debian-buster/control b/builder-support/debian/recursor/debian-buster/control
index f99d737a40034edb8156e364417872acfeb1fdd4..df21562b1fc617f9ce326362ba5eb854decc27f0 100644 (file)
--- a/builder-support/debian/recursor/debian-buster/control
+++ b/builder-support/debian/recursor/debian-buster/control
@@ -8,7 +8,8 @@ Build-Depends: debhelper (>= 10),
                dh-systemd [linux-any],
                libboost-all-dev,
                libcap-dev,
-               libluajit-5.1-dev,
+               libluajit-5.1-dev [!arm64],
+               liblua5.3-dev [arm64],
                libprotobuf-dev,
                libfstrm-dev,
                libsodium-dev,

diff --git a/builder-support/debian/recursor/debian-buster/rules b/builder-support/debian/recursor/debian-buster/rules
index 1274a166de9e4a49e0df56bde312379007f4f48c..8e48f3eb44fb7bb4871982f7f6b67ff94aaafefc 100755 (executable)
--- a/builder-support/debian/recursor/debian-buster/rules
+++ b/builder-support/debian/recursor/debian-buster/rules
@@ -17,6 +17,12 @@ else
 CONFIGURE_ARGS += --disable-systemd
 endif
 
+# Only disable luajit on arm64
+ifneq ($(DEB_HOST_ARCH),arm64)
+CONFIGURE_ARGS += --with-lua=luajit
+else
+CONFIGURE_ARGS += --with-lua=lua5.3
+endif
 
 # Use new build system
 %:
@@ -28,7 +34,6 @@ override_dh_auto_configure:
        dh_auto_configure -- \
                --sysconfdir=/etc/powerdns \
                --enable-unit-tests \
-               --with-lua=luajit \
                --with-libcap \
                --with-libsodium \
                --with-protobuf=yes \

diff --git a/builder-support/debian/recursor/debian-stretch/control b/builder-support/debian/recursor/debian-stretch/control
index f99d737a40034edb8156e364417872acfeb1fdd4..df21562b1fc617f9ce326362ba5eb854decc27f0 100644 (file)
--- a/builder-support/debian/recursor/debian-stretch/control
+++ b/builder-support/debian/recursor/debian-stretch/control
@@ -8,7 +8,8 @@ Build-Depends: debhelper (>= 10),
                dh-systemd [linux-any],
                libboost-all-dev,
                libcap-dev,
-               libluajit-5.1-dev,
+               libluajit-5.1-dev [!arm64],
+               liblua5.3-dev [arm64],
                libprotobuf-dev,
                libfstrm-dev,
                libsodium-dev,

diff --git a/builder-support/debian/recursor/debian-stretch/rules b/builder-support/debian/recursor/debian-stretch/rules
index 1274a166de9e4a49e0df56bde312379007f4f48c..8e48f3eb44fb7bb4871982f7f6b67ff94aaafefc 100755 (executable)
--- a/builder-support/debian/recursor/debian-stretch/rules
+++ b/builder-support/debian/recursor/debian-stretch/rules
@@ -17,6 +17,12 @@ else
 CONFIGURE_ARGS += --disable-systemd
 endif
 
+# Only disable luajit on arm64
+ifneq ($(DEB_HOST_ARCH),arm64)
+CONFIGURE_ARGS += --with-lua=luajit
+else
+CONFIGURE_ARGS += --with-lua=lua5.3
+endif
 
 # Use new build system
 %:
@@ -28,7 +34,6 @@ override_dh_auto_configure:
        dh_auto_configure -- \
                --sysconfdir=/etc/powerdns \
                --enable-unit-tests \
-               --with-lua=luajit \
                --with-libcap \
                --with-libsodium \
                --with-protobuf=yes \