[openwrt/openwrt] pkg-config: always use correct path for pkg-config.real

LEDE Commits lede-commits at lists.infradead.org
Sun Aug 14 13:42:20 PDT 2022


hauke pushed a commit to openwrt/openwrt.git, branch openwrt-22.03:
https://git.openwrt.org/6a638c134d790413ea2c6976caaa89f73375310c

commit 6a638c134d790413ea2c6976caaa89f73375310c
Author: Leonardo Mörlein <me at irrelefant.net>
AuthorDate: Tue Aug 9 21:54:04 2022 +0200

    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 at irrelefant.net>
    (cherry picked from commit 37c0d15a8e9eb30920091bff1bf466640bc64dad)
---
 tools/pkgconf/files/pkg-config | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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}" \




More information about the lede-commits mailing list