From 8874b4b4fe25b7fb47a1286ecde80708e9d5f0a2 Mon Sep 17 00:00:00 2001 From: Gunnar Beutner Date: Sun, 11 Apr 2021 16:20:53 +0200 Subject: [PATCH] Ports: Make sure pkg-config only picks up packages from the target --- Ports/.hosted_defs.sh | 3 +++ Ports/.port_include.sh | 9 +++++++++ 2 files changed, 12 insertions(+) diff --git a/Ports/.hosted_defs.sh b/Ports/.hosted_defs.sh index fa44d64b97..eeec19dc2d 100644 --- a/Ports/.hosted_defs.sh +++ b/Ports/.hosted_defs.sh @@ -8,3 +8,6 @@ export AR="${SERENITY_ARCH}-pc-serenity-ar" export RANLIB="${SERENITY_ARCH}-pc-serenity-ranlib" export PATH="${SERENITY_ROOT}/Toolchain/Local/${SERENITY_ARCH}/bin:${PATH}" export DESTDIR="${SERENITY_BUILD_DIR}/Root" +export PKG_CONFIG_DIR="" +export PKG_CONFIG_SYSROOT_DIR="${SERENITY_BUILD_DIR}/Root" +export PKG_CONFIG_LIBDIR="${PKG_CONFIG_SYSROOT_DIR}/usr/lib/pkgconfig/:${PKG_CONFIG_SYSROOT_DIR}/usr/local/lib/pkgconfig" diff --git a/Ports/.port_include.sh b/Ports/.port_include.sh index 2e282d450e..c61d01b607 100755 --- a/Ports/.port_include.sh +++ b/Ports/.port_include.sh @@ -3,6 +3,15 @@ set -eu SCRIPT="$(dirname "${0}")" export SERENITY_ARCH="${SERENITY_ARCH:-i686}" +export SERENITY_BUILD_DIR="${SERENITY_ROOT}/Build/${SERENITY_ARCH}" +export CC="${SERENITY_ARCH}-pc-serenity-gcc" +export CXX="${SERENITY_ARCH}-pc-serenity-g++" +export AR="${SERENITY_ARCH}-pc-serenity-ar" +export RANLIB="${SERENITY_ARCH}-pc-serenity-ranlib" +export PATH="${SERENITY_ROOT}/Toolchain/Local/${SERENITY_ARCH}/bin:${PATH}" +export PKG_CONFIG_DIR="" +export PKG_CONFIG_SYSROOT_DIR="${SERENITY_BUILD_DIR}/Root" +export PKG_CONFIG_LIBDIR="${PKG_CONFIG_SYSROOT_DIR}/usr/lib/pkgconfig/:${PKG_CONFIG_SYSROOT_DIR}/usr/local/lib/pkgconfig/" maybe_source() { if [ -f "$1" ]; then