From bfa622bf97262747cec626dc786a9d83dc945fe1 Mon Sep 17 00:00:00 2001
From: Michael Fincham <michael@hotplate.co.nz>
Date: Sun, 26 Jun 2022 18:12:06 +1200
Subject: [PATCH] Improve building i386 target in a mildly horrible way

---
 Dockerfile.openssl-1.1.1k | 1 +
 Dockerfile.stunnel-5.64   | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/Dockerfile.openssl-1.1.1k b/Dockerfile.openssl-1.1.1k
index 53a8ec2..8551138 100644
--- a/Dockerfile.openssl-1.1.1k
+++ b/Dockerfile.openssl-1.1.1k
@@ -14,6 +14,7 @@ LDFLAGS="-L/output/lib" \
 -static \
 no-shared no-engine no-idea no-mdc2 no-rc5 no-zlib no-ssl3 no-capieng \
 --prefix=/output \
+$(if echo "$MUSL_TARGET" | grep i386 >/dev/null; then printf -- '-latomic'; fi) \
 $(if echo "$MUSL_TARGET" | grep 64 >/dev/null; then echo linux-generic64; else echo linux-generic32; fi) && \
 make -j$(nproc) && \
 make install_sw && \
diff --git a/Dockerfile.stunnel-5.64 b/Dockerfile.stunnel-5.64
index 1ef5532..c3847d4 100644
--- a/Dockerfile.stunnel-5.64
+++ b/Dockerfile.stunnel-5.64
@@ -11,7 +11,7 @@ RUN export PATH=/build/cross/bin:$PATH:/output/bin && \
 cd stunnel-* && \
 export CC="$MUSL_TARGET-gcc" && \
 export CFLAGS="-static -I/output/include -frandom-seed=pulse" && \
-export LDFLAGS="--static -L/output/lib" && \
+export LDFLAGS="--static -L/output/lib $(if echo "$MUSL_TARGET" | grep i386 >/dev/null; then printf -- '-l:libatomic.a'; fi)" && \
 ./configure \
 --disable-shared \
 --disable-fips \
-- 
2.45.2