From 7362a7eb865d1aeeb45cff4f7e07847103c3c185 Mon Sep 17 00:00:00 2001
From: casey langen <casey.langen@gmail.com>
Date: Fri, 29 Apr 2022 21:09:32 -0700
Subject: [PATCH] Cross-compile isn't happy with OpenSSL 3.0.2, so let's use
 1.1.1n for rpi.

---
 CHANGELOG.txt                    | 2 +-
 script/build-vendor-libraries.sh | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 4bc0d5265..071b91a66 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -14,7 +14,7 @@
 * added support for the `piggy` debug tool to help with log collection and
   remote app monitoring. disabled by default.
 * updated Linux/macOS dependencies for standalone *nix builds: boost 1.79.0,
-  openssl 3.0.2, curl 7.83.0, ffmpeg 5.0.1, libopenmtp 0.6.2
+  openssl 3.0.2 (1.1.1n for rpi), curl 7.83.0, ffmpeg 5.0.1, libopenmtp 0.6.2
 
 --------------------------------------------------------------------------------
 
diff --git a/script/build-vendor-libraries.sh b/script/build-vendor-libraries.sh
index 4dc4d2d05..5d6e698c6 100755
--- a/script/build-vendor-libraries.sh
+++ b/script/build-vendor-libraries.sh
@@ -50,6 +50,7 @@ fi
 
 # update cross-compile vars, if specified.
 if [[ $CROSSCOMPILE == "rpi" ]]; then
+    OPENSSL_VERSION="1.1.1n"
     ARM_ROOT="/build/rpi/sysroot"
     export CPPFLAGS="-I${ARM_ROOT}/usr/include"
     export CXXFLAGS="$CXXFLAGS -I${ARM_ROOT}/usr/include"
@@ -59,7 +60,7 @@ if [[ $CROSSCOMPILE == "rpi" ]]; then
     GENERIC_CONFIGURE_FLAGS="--build=x86_64-pc-linux-gnu --host=arm-linux-gnueabihf --with-sysroot=${ARM_ROOT}"
     FFMPEG_CONFIGURE_FLAGS="--arch=${ARCH} --target-os=linux --cross-prefix=arm-linux-gnueabihf-"
     BOOST_TOOLSET="toolset=gcc-arm"
-    PKG_CONFIG_PATH="${OUTDIR}:${LIBDIR}:${LIBDIR}/pkgconfig/:${ARM_ROOT}/usr/lib/arm-linux-gnueabihf/pkgconfig/"
+    PKG_CONFIG_PATH="${LIBDIR}/pkgconfig/:${ARM_ROOT}/usr/lib/arm-linux-gnueabihf/pkgconfig/"
     printf "\n\ndetected CROSSCOMPILE=${CROSSCOMPILE}\n"
     printf "  CFLAGS=${CFLAGS}\n  CXXFLAGS=${CXXFLAGS}\n  LDFLAGS=${LDFLAGS}\n  GENERIC_CONFIGURE_FLAGS=${GENERIC_CONFIGURE_FLAGS}\n"
     printf "  BOOST_TOOLSET=${BOOST_TOOLSET}\n  OPENSSL_TYPE=${OPENSSL_TYPE}\n  OPENSSL_CROSSCOMPILE_PREFIX=${OPENSSL_CROSSCOMPILE_PREFIX}\n"