From patchwork Sun Apr 15 21:08:48 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Korsgaard X-Patchwork-Id: 152728 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hemlock.osuosl.org (hemlock.osuosl.org [140.211.166.133]) by ozlabs.org (Postfix) with ESMTP id 96004B6EE6 for ; Mon, 16 Apr 2012 07:10:24 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 2A197A0262; Sun, 15 Apr 2012 21:10:23 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 9WzN8Yhya5oV; Sun, 15 Apr 2012 21:10:20 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 984FAA0230; Sun, 15 Apr 2012 21:10:20 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (hemlock.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id D83788F753 for ; Sun, 15 Apr 2012 21:10:18 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id D4FA8A0230 for ; Sun, 15 Apr 2012 21:10:18 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id LAeDwKx5tf5z for ; Sun, 15 Apr 2012 21:10:18 +0000 (UTC) Received: from busybox.osuosl.org (busybox.osuosl.org [140.211.167.224]) by hemlock.osuosl.org (Postfix) with ESMTP id 55926A0227 for ; Sun, 15 Apr 2012 21:10:18 +0000 (UTC) Received: by busybox.osuosl.org (Postfix, from userid 4021) id 44BB396AAA; Sun, 15 Apr 2012 21:10:18 +0000 (UTC) From: Peter Korsgaard To: buildroot@busybox.net Date: Sun, 15 Apr 2012 23:08:48 +0200 X-Git-Refname: refs/heads/master X-Git-Oldrev: f5b6e19eff604bf92ab84c30eebd600f88d39db3 X-Git-Newrev: feba8b1382bfda10bc479f744e4697c868a23dc3 X-Patchwork-Hint: ignore Message-Id: <20120415211018.44BB396AAA@busybox.osuosl.org> Subject: [Buildroot] [git commit] package: set PKG_CONFIG_SYSROOT_DIR in HOST_MAKE_ENV X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net commit: http://git.buildroot.net/buildroot/commit/?id=feba8b1382bfda10bc479f744e4697c868a23dc3 branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master A host package that uses AUTORECONF (such as host-libglib2) may end up running './config.status --recheck'. This will call the configure script with the environment variables set in HOST_MAKE_ENV. If PKG_CONFIG_SYSROOT_DIR is missing this will cause the hardcoded sysroot dir take effect leading to wrong paths. See commit 22acade2ec311 which works around this problem by fiddling with the generated .pc file. This commit becomes obsolete with this fix. Signed-off-by: Sven Neumann Cc: Daniel Mack Signed-off-by: Peter Korsgaard --- package/Makefile.in | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/package/Makefile.in b/package/Makefile.in index dc8d038..c344c6b 100644 --- a/package/Makefile.in +++ b/package/Makefile.in @@ -222,6 +222,7 @@ HOST_CONFIGURE_OPTS=PATH=$(HOST_PATH) \ HOST_MAKE_ENV=PATH=$(HOST_PATH) \ LD_LIBRARY_PATH="$(HOST_DIR)/usr/lib:$(LD_LIBRARY_PATH)" \ PKG_CONFIG="$(PKG_CONFIG_HOST_BINARY)" \ + PKG_CONFIG_SYSROOT_DIR="/" \ PKG_CONFIG_LIBDIR="$(HOST_DIR)/usr/lib/pkgconfig" \ PERLLIB="$(HOST_DIR)/usr/lib/perl"