cd16e18584
The previous change to pkgconf9cc8680fe5, 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 the9cc8680fe5change. 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>
13 lines
840 B
Bash
13 lines
840 B
Bash
#!/bin/sh
|
|
PKGCONFDIR=$(dirname $0)
|
|
DEFAULT_PKG_CONFIG_LIBDIR=${PKGCONFDIR}/../@STAGING_SUBDIR@/usr/lib/pkgconfig:${PKGCONFDIR}/../@STAGING_SUBDIR@/usr/share/pkgconfig
|
|
DEFAULT_PKG_CONFIG_SYSROOT_DIR=${PKGCONFDIR}/../@STAGING_SUBDIR@
|
|
DEFAULT_PKG_CONFIG_SYSTEM_INCLUDE_PATH=${PKGCONFDIR}/../@STAGING_SUBDIR@/usr/include
|
|
DEFAULT_PKG_CONFIG_SYSTEM_LIBRARY_PATH=${PKGCONFDIR}/../@STAGING_SUBDIR@/usr/lib
|
|
|
|
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 --keep-system-libs @STATIC@ "$@"
|