Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1946513AbbHGXBS (ORCPT ); Fri, 7 Aug 2015 19:01:18 -0400 Received: from mail-pa0-f49.google.com ([209.85.220.49]:36466 "EHLO mail-pa0-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1946320AbbHGXBP (ORCPT ); Fri, 7 Aug 2015 19:01:15 -0400 From: Florian Fainelli To: linux-kernel@vger.kernel.org, rui.zhang@intel.com, jacob.jun.pan@linux.intel.com Cc: gregory.0xf0@gmail.com, Florian Fainelli , Brian Norris , Anand Moon Subject: [PATCH] tools/thermal: tmon: Allow overriding pkg-config Date: Fri, 7 Aug 2015 15:58:02 -0700 Message-Id: <1438988284-8453-1-git-send-email-f.fainelli@gmail.com> X-Mailer: git-send-email 2.1.0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1652 Lines: 44 Some build systems might not ship with a proper pkg-config infrastructure, so picking up the host pkg-config might cause us to link with ncursesw which may not be present in the build environment. Allow an external build system to override the pkg-config value (e.g: set it to /bin/false if we do not have anything). Fixes: 96a0d99c72cc ("tools/thermal: tmon: use pkg-config to determine library dependencies") Signed-off-by: Florian Fainelli --- tools/thermal/tmon/Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tools/thermal/tmon/Makefile b/tools/thermal/tmon/Makefile index 2e83dd3655a2..3777ab59d08c 100644 --- a/tools/thermal/tmon/Makefile +++ b/tools/thermal/tmon/Makefile @@ -11,6 +11,7 @@ TARGET=tmon INSTALL_PROGRAM=install -m 755 -p DEL_FILE=rm -f +PKG_CONFIG?=pkg-config # Static builds might require -ltinfo, for instance ifneq ($(findstring -static, $(LDFLAGS)),) @@ -18,8 +19,8 @@ STATIC := --static endif TMON_LIBS=-lm -lpthread -TMON_LIBS += $(shell pkg-config --libs $(STATIC) panelw ncursesw 2> /dev/null || \ - pkg-config --libs $(STATIC) panel ncurses 2> /dev/null || \ +TMON_LIBS += $(shell $(PKG_CONFIG) --libs $(STATIC) panelw ncursesw 2> /dev/null || \ + $(PKG_CONFIG) --libs $(STATIC) panel ncurses 2> /dev/null || \ echo -lpanel -lncurses) OBJS = tmon.o tui.o sysfs.o pid.o -- 2.1.0 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/