From 40490c3c8d01ebf1fa9635145606939c3bcb9fcc Mon Sep 17 00:00:00 2001
From: DavidKorczynski <david@adalogics.com>
Date: Thu, 6 Oct 2022 13:30:51 +0100
Subject: [PATCH] minizip: fix build (#8693)

Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=51117
---
 projects/minizip/Dockerfile | 2 +-
 projects/minizip/build.sh   | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/projects/minizip/Dockerfile b/projects/minizip/Dockerfile
index 9263c3e13..c74e4be85 100644
--- a/projects/minizip/Dockerfile
+++ b/projects/minizip/Dockerfile
@@ -15,7 +15,7 @@
 ################################################################################
 
 FROM gcr.io/oss-fuzz-base/base-builder
-RUN apt-get update && apt-get install -y make cmake pkg-config
+RUN apt-get update && apt-get install -y make cmake pkg-config libssl-dev:i386
 
 RUN git clone -b develop https://github.com/zlib-ng/minizip-ng
 WORKDIR minizip-ng
diff --git a/projects/minizip/build.sh b/projects/minizip/build.sh
index 4e9cd0021..672f24806 100755
--- a/projects/minizip/build.sh
+++ b/projects/minizip/build.sh
@@ -15,6 +15,12 @@
 #
 ################################################################################
 
+# Force static linking in i386 by removing dynamically linked libraries.
+if [ "$ARCHITECTURE" = 'i386' ]; then
+  rm /usr/lib/i386-linux-gnu/libssl.so*
+  rm /usr/lib/i386-linux-gnu/libcrypto.so*
+fi
+
 # Build project
 cmake . -DCMAKE_C_FLAGS="$CFLAGS" -DCMAKE_CXX_FLAGS="$CXXFLAGS" -DMZ_BUILD_FUZZ_TESTS=ON
 make clean