From 6afb693cbad880b0310422f61979ace365b44796 Mon Sep 17 00:00:00 2001 From: "Kevin P. Fleming" Date: Thu, 24 Sep 2020 07:48:56 -0400 Subject: [PATCH] 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 --- builder-support/debian/authoritative/debian-buster/control | 3 ++- builder-support/debian/authoritative/debian-buster/rules | 7 +++++++ .../debian/authoritative/debian-stretch/control | 3 ++- builder-support/debian/authoritative/debian-stretch/rules | 7 ++++++- builder-support/debian/dnsdist/debian-buster/control | 3 ++- builder-support/debian/dnsdist/debian-buster/rules | 7 ++++++- builder-support/debian/dnsdist/debian-stretch/control | 3 ++- builder-support/debian/dnsdist/debian-stretch/rules | 7 ++++++- builder-support/debian/recursor/debian-buster/control | 3 ++- builder-support/debian/recursor/debian-buster/rules | 7 ++++++- builder-support/debian/recursor/debian-stretch/control | 3 ++- builder-support/debian/recursor/debian-stretch/rules | 7 ++++++- 12 files changed, 49 insertions(+), 11 deletions(-) diff --git a/builder-support/debian/authoritative/debian-buster/control b/builder-support/debian/authoritative/debian-buster/control index a11956d906..4e64ed676d 100644 --- 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 22779b1756..600e7412b7 100755 --- 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 a11956d906..4e64ed676d 100644 --- 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 14bbc43c41..221f7a9877 100755 --- 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 0e2f77ba4b..3467f11e89 100644 --- 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 71b1950e12..2f2d0e303e 100755 --- 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 fc4fe07e15..63d7b00f41 100644 --- 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 d255665a09..55eebc3dcf 100755 --- 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 f99d737a40..df21562b1f 100644 --- 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 1274a166de..8e48f3eb44 100755 --- 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 f99d737a40..df21562b1f 100644 --- 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 1274a166de..8e48f3eb44 100755 --- 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 \ -- 2.47.2