From 44987619291a64a181cbdd5f6a3698a5cf3b3ea1 Mon Sep 17 00:00:00 2001
From: Thomas Orozco <thomas@orozco.fr>
Date: Wed, 2 Nov 2016 22:48:51 +0100
Subject: [PATCH] i386 build

---
 .travis.yml        | 1 +
 ci/install_deps.sh | 3 ++-
 ci/run_build.sh    | 4 +---
 ddist.sh           | 1 +
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index d7598e6..1c4098e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,6 +8,7 @@ env:
     - CC=gcc ARCH_SUFFIX=amd64 ARCH_NATIVE=1 NO_ARGS=
     - CC=arm-linux-gnueabihf-gcc ARCH_SUFFIX=armhf ARCH_NATIVE= NO_ARGS=
     - CC=aarch64-linux-gnu-gcc ARCH_SUFFIX=arm64 ARCH_NATIVE= NO_ARGS=
+    - CFLAGS="-m32" ARCH_SUFFIX=i386 ARCH_NATIVE= NO_ARGS=
     - CC=gcc ARCH_SUFFIX=amd64 ARCH_NATIVE=1 NO_ARGS=1
   global:
     - SIGN_BINARIES=1
diff --git a/ci/install_deps.sh b/ci/install_deps.sh
index da7412d..31976fe 100755
--- a/ci/install_deps.sh
+++ b/ci/install_deps.sh
@@ -9,6 +9,7 @@ apt-get install --no-install-recommends --yes \
   python-dev libcap-dev python-pip python-virtualenv \
   hardening-includes gnupg vim-common \
   gcc-aarch64-linux-gnu binutils-aarch64-linux-gnu libc6-dev-arm64-cross \
-  gcc-arm-linux-gnueabihf binutils-arm-linux-gnueabi libc6-dev-armhf-cross
+  gcc-arm-linux-gnueabihf binutils-arm-linux-gnueabi libc6-dev-armhf-cross \
+  libc6-dev-i386  gcc-multilib
 
 rm -rf /var/lib/apt/lists/*
diff --git a/ci/run_build.sh b/ci/run_build.sh
index 3752090..ff19240 100755
--- a/ci/run_build.sh
+++ b/ci/run_build.sh
@@ -27,13 +27,11 @@ export BUILD_DIR="$(readlink -f "${BUILD_DIR}")"
 : ${FORCE_SUBREAPER:="1"}
 export FORCE_SUBREAPER
 
-
 # Our build platform doesn't have those newer Linux flags, but we want Tini to have subreaper support
 # We also use those in our tests
-CFLAGS="-DPR_SET_CHILD_SUBREAPER=36 -DPR_GET_CHILD_SUBREAPER=37"
 if [[ "${FORCE_SUBREAPER}" -eq 1 ]]; then
   # If FORCE_SUBREAPER is requested, then we set those CFLAGS for the Tini build
-  export CFLAGS
+  export CFLAGS="-DPR_SET_CHILD_SUBREAPER=36 -DPR_GET_CHILD_SUBREAPER=37 ${CFLAGS:-}"
 fi
 
 # Ensure Python output is not buffered (to make tests output clearer)
diff --git a/ddist.sh b/ddist.sh
index 52d9d4c..7ed9860 100755
--- a/ddist.sh
+++ b/ddist.sh
@@ -22,6 +22,7 @@ docker run -it --rm \
   -e FORCE_SUBREAPER="${FORCE_SUBREAPER:="1"}" \
   -e GPG_PASSPHRASE="${GPG_PASSPHRASE:=}" \
   -e CC="${CC:=gcc}" \
+  -e CFLAGS="${CFLAGS-}" \
   -e ARCH_NATIVE="${ARCH_NATIVE-1}" \
   -e ARCH_SUFFIX="${ARCH_SUFFIX-}" \
   -e NO_ARGS="${NO_ARGS-}" \