From 91e0a04e667a13e58f04948ff8764b0c7caf62c8 Mon Sep 17 00:00:00 2001
From: Maarten Billemont <lhunath@lyndir.com>
Date: Sun, 13 Aug 2017 16:53:18 -0400
Subject: [PATCH] Add support for i386 in libjson-c and libsodium builds.

---
 platform-darwin/Scripts/build_libjson-c-ios | 12 ++++++++++++
 platform-darwin/Scripts/build_libsodium-ios | 12 ++++++++++++
 2 files changed, 24 insertions(+)

diff --git a/platform-darwin/Scripts/build_libjson-c-ios b/platform-darwin/Scripts/build_libjson-c-ios
index 2ee72ec9..d7ab3421 100755
--- a/platform-darwin/Scripts/build_libjson-c-ios
+++ b/platform-darwin/Scripts/build_libjson-c-ios
@@ -8,12 +8,24 @@ cd "${BASH_SOURCE%/*}/../External/libjson-c"
 autoreconf -Iautoconf-archive/m4 --verbose --install --symlink --force 2>&1 | sed 's/^\([^:]*\):[0-9]\{1,\}: /\1: /'
 rm -rf "${prefix=$PWD/libjson-c-ios}"
 mkdir -p "$prefix/lib" \
+    "${prefix_i386=$prefix/tmp/i386}" \
     "${prefix_x86_64=$prefix/tmp/x86_64}" \
     "${prefix_armv7=$prefix/tmp/armv7}" \
     "${prefix_armv7s=$prefix/tmp/armv7s}" \
     "${prefix_arm64=$prefix/tmp/arm64}"
 
 # Targets
+(
+    ## ARCH: i386
+    export SDKROOT="$(xcrun --show-sdk-path --sdk iphonesimulator)"
+    export PATH="$(xcrun --show-sdk-platform-path --sdk iphonesimulator)/usr/bin:$PATH"
+    export CFLAGS="-arch i386 -isysroot $SDKROOT -mios-simulator-version-min=${IPHONEOS_DEPLOYMENT_TARGET:-8.0} -O2 -g -flto $CFLAGS"
+    export LDFLAGS="-arch i386 -isysroot $SDKROOT -mios-simulator-version-min=${IPHONEOS_DEPLOYMENT_TARGET:-8.0} -flto $LDFLAGS"
+    export CPPFLAGS="$CFLAGS $CPPFLAGS"
+    [[ -e Makefile ]] && make -s clean
+    ./configure --host=i686-apple --disable-shared --prefix="$prefix_i386"
+    make -j3 install
+)
 (
     ## ARCH: x86_64
     export SDKROOT="$(xcrun --show-sdk-path --sdk iphonesimulator)"
diff --git a/platform-darwin/Scripts/build_libsodium-ios b/platform-darwin/Scripts/build_libsodium-ios
index 167640a7..6b0db269 100755
--- a/platform-darwin/Scripts/build_libsodium-ios
+++ b/platform-darwin/Scripts/build_libsodium-ios
@@ -8,12 +8,24 @@ cd "${BASH_SOURCE%/*}/../External/libsodium"
 autoreconf --verbose --install --symlink --force 2>&1 | sed 's/^\([^:]*\):[0-9]\{1,\}: /\1: /'
 rm -rf "${prefix=$PWD/libsodium-ios}"
 mkdir -p "$prefix/lib" \
+    "${prefix_i386=$prefix/tmp/i386}" \
     "${prefix_x86_64=$prefix/tmp/x86_64}" \
     "${prefix_armv7=$prefix/tmp/armv7}" \
     "${prefix_armv7s=$prefix/tmp/armv7s}" \
     "${prefix_arm64=$prefix/tmp/arm64}"
 
 # Targets
+(
+    ## ARCH: i386
+    export SDKROOT="$(xcrun --show-sdk-path --sdk iphonesimulator)"
+    export PATH="$(xcrun --show-sdk-platform-path --sdk iphonesimulator)/usr/bin:$PATH"
+    export CFLAGS="-arch i386 -isysroot $SDKROOT -mios-simulator-version-min=${IPHONEOS_DEPLOYMENT_TARGET:-8.0} -O2 -g -flto $CFLAGS"
+    export LDFLAGS="-arch i386 -isysroot $SDKROOT -mios-simulator-version-min=${IPHONEOS_DEPLOYMENT_TARGET:-8.0} -flto $LDFLAGS"
+    export CPPFLAGS="$CFLAGS $CPPFLAGS"
+    [[ -e Makefile ]] && make -s distclean
+    ./configure --host=i686-apple --disable-shared --prefix="$prefix_i386"
+    make -j3 install
+)
 (
     ## ARCH: x86_64
     export SDKROOT="$(xcrun --show-sdk-path --sdk iphonesimulator)"