aboutsummaryrefslogtreecommitdiff
path: root/package/pkgconf/pkg-config.in
diff options
context:
space:
mode:
authorGravatar Thomas Preston <thomas.preston@codethink.co.uk>2019-12-05 17:14:48 +0000
committerGravatar Yann E. MORIN <yann.morin.1998@free.fr>2020-01-14 17:14:46 +0100
commitcd16e18584066d2817d3acb3822e173f9f23455e (patch)
treefaeb5e5d899e53a0a453b7f577d1473e13f2d278 /package/pkgconf/pkg-config.in
parent6bff7e7561562a881ccaa594f66ec77f9e7ddc4e (diff)
downloadbuildroot-cd16e18584066d2817d3acb3822e173f9f23455e.tar.gz
buildroot-cd16e18584066d2817d3acb3822e173f9f23455e.tar.bz2
pkgconf: always keep system libs
The previous change to pkgconf 9cc8680fe5, which tells it about the target sysroot system lib and include dirs so that they are not printed by default, introduced a regression where packages relying on libtool could no longer see Libtool Archive (.la) files in the system lib directory. Since we still rely on pkgconf not printing the system include directory to allow the correct ordering of -I, -isystem and compiler default search paths, and it is still correct behaviour to tell pkgconf about the new system lib dir (in the target sysroot), we should not revert the previous change. Instead, we should explicitly request pkgconf to print the system libs globally, so that all packages which rely on libtool can find the Libtool Archive files. For system lib directories, this is the same pkgconf behaviour as before the 9cc8680fe5 change. Fixes: http://autobuild.buildroot.org/results/a79/a79e0487135ad90530595d5c6ecc32f9c8cea7c4/ http://autobuild.buildroot.net/results/089/08952dbf89bf3c49da7697943441cee411940420/ http://autobuild.buildroot.org/results/7ca/7ca3e6c17d8ce5a53715d719ae9de2551ce2a669/ ... Signed-off-by: Thomas Preston <thomas.preston@codethink.co.uk> Signed-off-by: Michael Drake <michael.drake@codethink.co.uk> Tested-by: Peter Seiderer <ps.report@gmx.net> Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
Diffstat (limited to 'package/pkgconf/pkg-config.in')
-rw-r--r--package/pkgconf/pkg-config.in2
1 files changed, 1 insertions, 1 deletions
diff --git a/package/pkgconf/pkg-config.in b/package/pkgconf/pkg-config.in
index f411eb0926..e5a23a10f7 100644
--- a/package/pkgconf/pkg-config.in
+++ b/package/pkgconf/pkg-config.in
@@ -9,4 +9,4 @@ PKG_CONFIG_LIBDIR=${PKG_CONFIG_LIBDIR:-${DEFAULT_PKG_CONFIG_LIBDIR}} \
PKG_CONFIG_SYSROOT_DIR=${PKG_CONFIG_SYSROOT_DIR:-${DEFAULT_PKG_CONFIG_SYSROOT_DIR}} \
PKG_CONFIG_SYSTEM_INCLUDE_PATH=${PKG_CONFIG_SYSTEM_INCLUDE_PATH:-${DEFAULT_PKG_CONFIG_SYSTEM_INCLUDE_PATH}} \
PKG_CONFIG_SYSTEM_LIBRARY_PATH=${PKG_CONFIG_SYSTEM_LIBRARY_PATH:-${DEFAULT_PKG_CONFIG_SYSTEM_LIBRARY_PATH}} \
- exec ${PKGCONFDIR}/pkgconf @STATIC@ "$@"
+ exec ${PKGCONFDIR}/pkgconf --keep-system-libs @STATIC@ "$@"