From: Leonardo Mörlein <me@irrelefant.net>
Date: Tue, 9 Aug 2022 19:54:04 +0000 (+0200)
Subject: pkg-config: always use correct path for pkg-config.real
X-Git-Tag: v22.03.0~65
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=6a638c134d790413ea2c6976caaa89f73375310c;p=openwrt%2Fopenwrt.git

pkg-config: always use correct path for pkg-config.real

Before this commit, it was assumed that pkg-config.real is in the PATH. While
this was fine for the normal build workflow, this led to some issues if

    make TOPDIR="$(pwd)" -C "$pkgdir" compile

was called manually. The command failed with

    Makefile:15: *** No libnl-tiny development libraries found!.  Stop.
    make[1]: Leaving directory

since pkg-config of the host system was used.

After the commit, the package is built sucessfully.

Signed-off-by: Leonardo Mörlein <me@irrelefant.net>
(cherry picked from commit 37c0d15a8e9eb30920091bff1bf466640bc64dad)
---

diff --git a/tools/pkgconf/files/pkg-config b/tools/pkgconf/files/pkg-config
index 91d144d9b1..65e0fb09f5 100755
--- a/tools/pkgconf/files/pkg-config
+++ b/tools/pkgconf/files/pkg-config
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-pkg-config.real \
+${STAGING_DIR_HOST}/bin/pkg-config.real \
 --keep-system-cflags \
 --keep-system-libs \
 --define-variable=prefix="${STAGING_PREFIX}" \