From patchwork Fri Sep 22 19:41:44 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Mayer X-Patchwork-Id: 817681 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.138; helo=whitealder.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3xzPGL5QQHz9t32 for ; Sat, 23 Sep 2017 05:50:17 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 1482889AE8; Fri, 22 Sep 2017 19:50:14 +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 wOV7VEQn7iSY; Fri, 22 Sep 2017 19:50:12 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 7CAE389A5E; Fri, 22 Sep 2017 19:50:12 +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 52F621C0599 for ; Fri, 22 Sep 2017 19:50:11 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 4352C88AC7 for ; Fri, 22 Sep 2017 19:50:11 +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 H5-EF_hWxCEq for ; Fri, 22 Sep 2017 19:50:09 +0000 (UTC) X-Greylist: delayed 00:08:07 by SQLgrey-1.7.6 Received: from smtp-out-so.shaw.ca (smtp-out-so.shaw.ca [64.59.136.139]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 8F7B088AC6 for ; Fri, 22 Sep 2017 19:50:09 +0000 (UTC) Received: from triton.mmayer.net ([96.48.165.49]) by shaw.ca with SMTP id vTpndywt8DJTWvTpodR5ED; Fri, 22 Sep 2017 13:42:01 -0600 X-Authority-Analysis: v=2.2 cv=B4DJ6KlM c=1 sm=1 tr=0 a=k5HOQ6ZN7M0zyjl8M7O1NA==:117 a=k5HOQ6ZN7M0zyjl8M7O1NA==:17 a=2JCJgTwv5E4A:10 a=Q-fNiiVtAAAA:8 a=J0Tn2xNtAAAA:8 a=VnzYO6doOZigy1Gi8UMA:9 a=4xv2YsoptpEA:10 a=Fp8MccfUoT0GBdDC_Lng:22 a=9ZcRxastL33iXWX1AWsW:22 Received: by triton.mmayer.net (Postfix, from userid 501) id 6CF9B5C63E6F; Fri, 22 Sep 2017 12:41:58 -0700 (PDT) From: Markus Mayer To: buildroot@buildroot.org Date: Fri, 22 Sep 2017 12:41:44 -0700 Message-Id: <20170922194144.52761-1-mmayer@broadcom.com> X-Mailer: git-send-email 2.14.1 X-CMAE-Envelope: MS4wfHg/6nEchmGPRVUs0xkaB4MemsOuaCjhpwjmdofcDO9/F3cUcMFvoWHZ9kg7+NWlwzzyRY7qH9F/KAeRapzY+YNbdq4sP6jzFwttMZxl9cQDtil6jti0 cLYPJy3teCmdZm+ZZAjJAaomoeQ1sgGwgIXlaS44lrerOwSbS2W0GqukFF7+f6G+SQSzZtvcR55TUySP5kwJ+KUneIHUYYuecws= Cc: Markus Mayer Subject: [Buildroot] [PATCH] package/linux-tools: add host dependency for pkg-config X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 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" We need to include host-pkgconf in the host dependencies, and we need to pass HOST_MAKE_ENV to make, so PKG_CONFIG is set properly. Without it, the system's pkg-config will be used, and compilation may fail. Signed-off-by: Markus Mayer --- This is a follow-on to my patches from a couple of months ago.[1] I was certain I had already submitted this patch upstream back then, but apparently not. So here goes. On my Ubuntu 16.04 box, tmon doesn't build (for ARM or MIPS) unless I include this change. [1] http://lists.busybox.net/pipermail/buildroot/2017-July/thread.html#198247 package/linux-tools/linux-tool-tmon.mk.in | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/package/linux-tools/linux-tool-tmon.mk.in b/package/linux-tools/linux-tool-tmon.mk.in index 15931c3..e4afe82 100644 --- a/package/linux-tools/linux-tool-tmon.mk.in +++ b/package/linux-tools/linux-tool-tmon.mk.in @@ -7,6 +7,8 @@ LINUX_TOOLS += tmon TMON_DEPENDENCIES = host-pkgconf ncurses +HOST_TMON_DEPENDENCIES = host-pkgconf + TMON_MAKE_OPTS = $(LINUX_MAKE_FLAGS) \ CC=$(TARGET_CC) \ PKG_CONFIG_PATH=$(STAGING_DIR)/usr/lib/pkgconfig @@ -24,13 +26,13 @@ define TMON_BUILD_CMDS exit 1 ; \ fi $(TMON_DISABLE_STACK_PROTECTOR) - $(TARGET_MAKE_ENV) $(MAKE) -C $(LINUX_DIR)/tools \ + $(HOST_MAKE_ENV) $(TARGET_MAKE_ENV) $(MAKE) -C $(LINUX_DIR)/tools \ $(TMON_MAKE_OPTS) \ tmon endef define TMON_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(LINUX_DIR)/tools \ + $(HOST_MAKE_ENV) $(TARGET_MAKE_ENV) $(MAKE) -C $(LINUX_DIR)/tools \ $(TMON_MAKE_OPTS) \ INSTALL_ROOT=$(TARGET_DIR) \ tmon_install