From patchwork Mon Oct 21 12:38:10 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Preston X-Patchwork-Id: 1180558 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.137; helo=fraxinus.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 fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 46xbln3RJDz9sPZ for ; Mon, 21 Oct 2019 23:38:28 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id BF2A5859D6; Mon, 21 Oct 2019 12:38:26 +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 MQOZIBMveAih; Mon, 21 Oct 2019 12:38:26 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 780A485992; Mon, 21 Oct 2019 12:38:25 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 183271BF32C for ; Mon, 21 Oct 2019 12:38:24 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id EEADF8680D for ; Mon, 21 Oct 2019 12:38:23 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id IJ82QtO9XYP0 for ; Mon, 21 Oct 2019 12:38:23 +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 whitealder.osuosl.org (Postfix) with ESMTPS id DFD87867D4 for ; Mon, 21 Oct 2019 12:38:22 +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 1iMWx2-0003ik-Cd; Mon, 21 Oct 2019 13:38:20 +0100 From: Thomas Preston To: buildroot@buildroot.org, michael.drake@codethink.co.uk Date: Mon, 21 Oct 2019 13:38:10 +0100 Message-Id: <20191021123810.23135-1-thomas.preston@codethink.co.uk> X-Mailer: git-send-email 2.21.0 MIME-Version: 1.0 Subject: [Buildroot] [PATCH] pkgconf: Add HOST_MAKE_ENV sytem include and lib 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: Thomas Preston Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Recently, a change to the pkg-config wrapper made it more explicit about where the system include and library directories are, so that pkgconf does not print them. See upstream commit 9cc8680. By default, we configure the pkg-config wrapper for the target sysroot, however the default system include and library directories are not reconfigured for the host build environment (they still point at the target sysroot). Fix this by adding the host system include and library directories to HOST_MAKE_ENV. Note: this isn't likely to fix any bugs at present, but the incorrect configuration may hide an include-order related error which the original patch was supposed to fix! Signed-off-by: Thomas Preston --- package/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/Makefile.in b/package/Makefile.in index 0a7899c852..3ae4d4d4e9 100644 --- a/package/Makefile.in +++ b/package/Makefile.in @@ -309,6 +309,8 @@ HOST_MAKE_ENV = \ PATH=$(BR_PATH) \ PKG_CONFIG="$(PKG_CONFIG_HOST_BINARY)" \ PKG_CONFIG_SYSROOT_DIR="/" \ + PKG_CONFIG_SYSTEM_INCLUDE_PATH="/usr/include" \ + PKG_CONFIG_SYSTEM_LIBRARY_PATH="/usr/lib" \ PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 \ PKG_CONFIG_ALLOW_SYSTEM_LIBS=1 \ PKG_CONFIG_LIBDIR="$(HOST_DIR)/lib/pkgconfig:$(HOST_DIR)/share/pkgconfig"