Skip to content

Commit

Permalink
builder-support: Disable luajit usage on aarch64 Debian/Ubuntu builds
Browse files Browse the repository at this point in the history 
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>
  • Loading branch information
@kpfleming
kpfleming committed Sep 24, 2020
1 parent fe31b88 commit 6afb693
Show file tree
Hide file tree
Showing 12 changed files with 49 additions and 11 deletions.
3 changes: 2 additions & 1 deletion builder-support/debian/authoritative/debian-buster/control
View file
Expand Up @@ -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,
Expand Down
7 changes: 7 additions & 0 deletions builder-support/debian/authoritative/debian-buster/rules
View file
Expand Up @@ -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 $@ \
Expand Down
3 changes: 2 additions & 1 deletion builder-support/debian/authoritative/debian-stretch/control
View file
Expand Up @@ -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,
Expand Down
7 changes: 6 additions & 1 deletion builder-support/debian/authoritative/debian-stretch/rules
View file
Expand Up @@ -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
%:
Expand All @@ -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 \
Expand Down
3 changes: 2 additions & 1 deletion builder-support/debian/dnsdist/debian-buster/control
View file
Expand Up @@ -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,
Expand Down
7 changes: 6 additions & 1 deletion builder-support/debian/dnsdist/debian-buster/rules
View file
Expand Up @@ -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 $@ \
Expand Down Expand Up @@ -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' \
Expand Down
3 changes: 2 additions & 1 deletion builder-support/debian/dnsdist/debian-stretch/control
View file
Expand Up @@ -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,
Expand Down
7 changes: 6 additions & 1 deletion builder-support/debian/dnsdist/debian-stretch/rules
View file
Expand Up @@ -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 $@ \
Expand Down Expand Up @@ -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' \
Expand Down
3 changes: 2 additions & 1 deletion builder-support/debian/recursor/debian-buster/control
View file
Expand Up @@ -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,
Expand Down
7 changes: 6 additions & 1 deletion builder-support/debian/recursor/debian-buster/rules
View file
Expand Up @@ -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
%:
Expand All @@ -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 \
Expand Down
3 changes: 2 additions & 1 deletion builder-support/debian/recursor/debian-stretch/control
View file
Expand Up @@ -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,
Expand Down
7 changes: 6 additions & 1 deletion builder-support/debian/recursor/debian-stretch/rules
View file
Expand Up @@ -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
%:
Expand All @@ -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 \
Expand Down

0 comments on commit 6afb693

Please sign in to comment.