From e6170381c26f192a27be86f070602bf2323ada3b Mon Sep 17 00:00:00 2001
From: Guilherme Melo <guilmelo@amazon.com>
Date: Tue, 3 Sep 2024 15:26:13 +0200
Subject: [PATCH] Fix pkg-config when cross compiling curl

---
 tools/install-deps-cross-android.sh | 2 +-
 tools/install-deps-cross-arm64.sh   | 4 ++--
 tools/install-deps-cross-armhf.sh   | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/tools/install-deps-cross-android.sh b/tools/install-deps-cross-android.sh
index 0cb6db53..df6aee12 100755
--- a/tools/install-deps-cross-android.sh
+++ b/tools/install-deps-cross-android.sh
@@ -242,7 +242,7 @@ install_deps() {
         RANLIB=${TOOLCHAIN}/bin/llvm-ranlib \
         STRIP=${TOOLCHAIN}/bin/llvm-strip \
         LDFLAGS="-static" \
-        PKG_CONFIG="pkg-config --static" \
+        PKG_CONFIG="pkg-config --static" PKG_CONFIG_LIBDIR=${INSTALL_PREFIX} \
         ./configure \
             --disable-shared \
             --enable-static \
diff --git a/tools/install-deps-cross-arm64.sh b/tools/install-deps-cross-arm64.sh
index c30d7e70..c54454a3 100755
--- a/tools/install-deps-cross-arm64.sh
+++ b/tools/install-deps-cross-arm64.sh
@@ -225,14 +225,14 @@ if ! ${USE_CACHE} || [ ! -d /usr/local/aarch64-linux-gnu ] || [ ! -d ${NATIVE_PR
         --with-ca-fallback
         --prefix=/usr/local/aarch64-linux-gnu"
     if [ "${SHARED_LIBS}" == "OFF" ]; then
-        LDFLAGS="-static" PKG_CONFIG="pkg-config --static" CC=aarch64-linux-gnu-gcc \
+        LDFLAGS="-static" PKG_CONFIG="pkg-config --static" CC=aarch64-linux-gnu-gcc PKG_CONFIG_LIBDIR=/usr/lib/aarch64-linux-gnu \
         ../configure \
             --disable-shared \
             --enable-static \
             ${CURL_OPTIONS}
         make install -j`nproc` V=1 LDFLAGS="-static"
     else
-        CC=aarch64-linux-gnu-gcc \
+        CC=aarch64-linux-gnu-gcc PKG_CONFIG_LIBDIR=/usr/lib/aarch64-linux-gnu \
         ../configure \
             --enable-shared \
             --disable-static \
diff --git a/tools/install-deps-cross-armhf.sh b/tools/install-deps-cross-armhf.sh
index 71711ca7..ae346687 100755
--- a/tools/install-deps-cross-armhf.sh
+++ b/tools/install-deps-cross-armhf.sh
@@ -225,14 +225,14 @@ if ! ${USE_CACHE} || [ ! -d /usr/local/arm-linux-gnueabihf ] || [ ! -d ${NATIVE_
         --with-ca-fallback
         --prefix=/usr/local/arm-linux-gnueabihf"
     if [ "${SHARED_LIBS}" == "OFF" ]; then
-        LDFLAGS="-static" PKG_CONFIG="pkg-config --static" CC=arm-linux-gnueabihf-gcc \
+        LDFLAGS="-static" PKG_CONFIG="pkg-config --static" CC=arm-linux-gnueabihf-gcc PKG_CONFIG_LIBDIR=/usr/lib/arm-linux-gnueabihf \
         ../configure \
             --disable-shared \
             --enable-static \
             ${CURL_OPTIONS}
         make install -j`nproc` V=1 LDFLAGS="-static"
     else
-        CC=arm-linux-gnueabihf-gcc \
+        CC=arm-linux-gnueabihf-gcc PKG_CONFIG_LIBDIR=/usr/lib/arm-linux-gnueabihf \
         ../configure \
             --enable-shared \
             --disable-static \