From b2356b46db5f6fbda672cef3feebb6914adca24e Mon Sep 17 00:00:00 2001
From: Dominik Hassler <hadfl@omnios.org>
Date: Thu, 3 Oct 2024 16:19:05 +0000
Subject: [PATCH] aarch64: fix builds

---
 build/glib/build.sh    | 1 +
 build/libpcap/build.sh | 2 ++
 build/sudo/build.sh    | 6 ++++++
 3 files changed, 9 insertions(+)

diff --git a/build/glib/build.sh b/build/glib/build.sh
index b2a2740b1..1fb63ca7a 100755
--- a/build/glib/build.sh
+++ b/build/glib/build.sh
@@ -43,6 +43,7 @@ CFLAGS+=" -Wno-error=format-nonliteral -Wno-error=format=2"
 # See comment in /usr/include/pwd.h
 set_standard XPG6
 
+CFLAGS[aarch64]+=" -mtls-dialect=trad"
 LDFLAGS+=" -Wl,-z,ignore"
 LDFLAGS[i386]+=" -lssp_ns"
 
diff --git a/build/libpcap/build.sh b/build/libpcap/build.sh
index a68254eb7..76531d48b 100755
--- a/build/libpcap/build.sh
+++ b/build/libpcap/build.sh
@@ -27,6 +27,8 @@ CONFIGURE_OPTS="
     --mandir=/usr/share/man
     --with-pcap=dlpi
 "
+
+CFLAGS[aarch64]+=" -mtls-dialect=trad"
 LDFLAGS+=" $SSPFLAGS"
 
 build_init() {
diff --git a/build/sudo/build.sh b/build/sudo/build.sh
index a7a662df4..a5f4c9c06 100755
--- a/build/sudo/build.sh
+++ b/build/sudo/build.sh
@@ -45,6 +45,12 @@ CONFIGURE_OPTS="
 CONFIGURE_OPTS[amd64]+="
     --libexecdir=/usr/lib/$PROG/amd64
 "
+# for cross-builds this is detected as 'cross' which leads to sudo
+# using its own implementation; however, the build fails to make
+# the symbols global which breaks linking
+CONFIGURE_OPTS[aarch64]+="
+    ac_cv_have_working_vsnprintf=yes
+"
 
 SKIP_LICENCES=Various
 TESTSUITE_SED="