From patchwork Mon Nov 25 12:42:21 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Preston X-Patchwork-Id: 1200380 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.136; helo=silver.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=codethink.co.uk Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47M6BK6Gggz9s7T for ; Mon, 25 Nov 2019 23:42:33 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 1B71C1FE65; Mon, 25 Nov 2019 12:42:32 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 9EvVaZvEOk92; Mon, 25 Nov 2019 12:42:30 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 848D62035C; Mon, 25 Nov 2019 12:42:30 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id F38171BF313 for ; Mon, 25 Nov 2019 12:42:28 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id EFEE78532B for ; Mon, 25 Nov 2019 12:42:28 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id iGkSpVp6D3Hv for ; Mon, 25 Nov 2019 12:42:28 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from imap1.codethink.co.uk (imap1.codethink.co.uk [176.9.8.82]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 00E6D85319 for ; Mon, 25 Nov 2019 12:42:27 +0000 (UTC) Received: from [167.98.27.226] (helo=ct-lt-1124.office.codethink.co.uk) by imap1.codethink.co.uk with esmtpsa (Exim 4.84_2 #1 (Debian)) id 1iZDhB-0008HG-CF; Mon, 25 Nov 2019 12:42:25 +0000 From: Thomas Preston To: buildroot@buildroot.org Date: Mon, 25 Nov 2019 12:42:21 +0000 Message-Id: <20191125124221.248655-1-thomas.preston@codethink.co.uk> X-Mailer: git-send-email 2.23.0 MIME-Version: 1.0 Subject: [Buildroot] [PATCH v2] pkgconf: always keep system libs X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: michael.drake@codethink.co.uk, Thomas Preston , fontaine.fabrice@gmail.com, ps.report@gmx.net, thomas.petazzoni@bootlin.com, yann.morin.1998@free.fr Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Normally pkgconf ignores the system include and system lib directories, which is useful because it allows the correct ordering of -I, -isystem and compiler default search paths. However, many packages use libtool, which relies on pkgconf to print the system libs dirs in order to locate the Libtool Archive (.la) files. Instead of adding PKG_CONFIG_ALLOW_SYSTEM_LIBS=1 to each of these packages, just allow system libs globally in the pkg-config wrapper. This allows libtool to find the .la files, and retains the correct include ordering. Fixes (at least): - http://autobuild.buildroot.org/results/a79e0487135ad90530595d5c6ecc32f9c8cea7c4/ - http://autobuild.buildroot.net/results/089/08952dbf89bf3c49da7697943441cee411940420/ Signed-off-by: Thomas Preston Tested-by: Peter Seiderer --- package/pkgconf/pkg-config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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@ "$@"