From 1af76fd88c1d3bf42d660eb6e8e1c57c282fd7ee Mon Sep 17 00:00:00 2001
From: James-Crowley <James.Crowley@ibm.com>
Date: Fri, 5 Feb 2021 14:44:33 -0500
Subject: [PATCH] Adding in more arch aware code to support other architectures
 like s390x and ppc64le

---
 Dockerfile-auth                                            | 4 ++--
 builder-support/debian/authoritative/debian-buster/control | 4 ++--
 builder-support/debian/dnsdist/debian-buster/control       | 4 ++--
 builder-support/debian/recursor/debian-buster/control      | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Dockerfile-auth b/Dockerfile-auth
index 0c15dc74a9..02fb6100a7 100644
--- a/Dockerfile-auth
+++ b/Dockerfile-auth
@@ -7,7 +7,7 @@ FROM debian:10-slim AS builder
 RUN apt-get update && apt-get -y dist-upgrade && apt-get clean
 
 # devscripts gives us mk-build-deps (and a lot of other stuff)
-RUN apt-get update && apt-get -y dist-upgrade && apt-get install -y  --no-install-recommends devscripts equivs git python3-venv && apt-get clean
+RUN apt-get update && apt-get -y dist-upgrade && apt-get install -y  --no-install-recommends devscripts dpkg-dev equivs git python3-venv && apt-get clean
 
 # import everything - this could be pdns.git OR an auth tarball!
 COPY builder-support /source/builder-support
@@ -50,7 +50,7 @@ RUN mkdir /build && \
       --with-dynmodules='bind geoip gmysql godbc gpgsql gsqlite3 ldap lmdb lua2 pipe random remote tinydns' \
       --enable-tools \
       --enable-ixfrdist \
-      --with-unixodbc-lib=/usr/lib/$(uname -m)-linux-gnu && \
+      --with-unixodbc-lib=/usr/lib/$(dpkg-architecture -q DEB_BUILD_GNU_TYPE) && \
     make clean && \
     make $MAKEFLAGS -C ext && make $MAKEFLAGS -C modules && make $MAKEFLAGS -C pdns && \
     make -C pdns install DESTDIR=/build && make -C modules install DESTDIR=/build && make clean && \
diff --git a/builder-support/debian/authoritative/debian-buster/control b/builder-support/debian/authoritative/debian-buster/control
index 803b97b2b0..fb99e59b15 100644
--- a/builder-support/debian/authoritative/debian-buster/control
+++ b/builder-support/debian/authoritative/debian-buster/control
@@ -24,8 +24,8 @@ Build-Depends: autoconf,
                libkrb5-dev,
                libldap2-dev,
                liblmdb-dev,
-               libluajit-5.1-dev [!arm64],
-               liblua5.3-dev [arm64],
+               libluajit-5.1-dev [!arm64 !s390x],
+               liblua5.3-dev [arm64 s390x],
                libmaxminddb-dev,
                libp11-kit-dev,
                libpq-dev,
diff --git a/builder-support/debian/dnsdist/debian-buster/control b/builder-support/debian/dnsdist/debian-buster/control
index deb19af486..132d767e62 100644
--- a/builder-support/debian/dnsdist/debian-buster/control
+++ b/builder-support/debian/dnsdist/debian-buster/control
@@ -12,8 +12,8 @@ Build-Depends: debhelper (>= 10),
                libgnutls28-dev,
                libh2o-evloop-dev,
                liblmdb-dev,
-               libluajit-5.1-dev [!arm64],
-               liblua5.3-dev [arm64],
+               libluajit-5.1-dev [!arm64 !s390x],
+               liblua5.3-dev [arm64 s390x],
                libre2-dev,
                libsnmp-dev,
                libsodium-dev,
diff --git a/builder-support/debian/recursor/debian-buster/control b/builder-support/debian/recursor/debian-buster/control
index 8634bf4a70..cd3ea388fb 100644
--- a/builder-support/debian/recursor/debian-buster/control
+++ b/builder-support/debian/recursor/debian-buster/control
@@ -8,8 +8,8 @@ Build-Depends: debhelper (>= 10),
                dh-systemd [linux-any],
                libboost-all-dev,
                libcap-dev,
-               libluajit-5.1-dev [!arm64],
-               liblua5.3-dev [arm64],
+               libluajit-5.1-dev [!arm64 !s390x],
+               liblua5.3-dev [arm64 s390x],
                libfstrm-dev,
                libsodium-dev,
                libssl-dev,
-- 
2.47.3