From: Brian Norris <computersforpeace@gmail.com>
To: Florian Fainelli <f.fainelli@gmail.com>
Cc: linux-kernel@vger.kernel.org, rui.zhang@intel.com,
jacob.jun.pan@linux.intel.com, gregory.0xf0@gmail.com,
Anand Moon <linux.amoon@gmail.com>
Subject: Re: [PATCH] tools/thermal: tmon: Allow overriding pkg-config
Date: Fri, 7 Aug 2015 16:13:10 -0700 [thread overview]
Message-ID: <20150807231310.GE60523@google.com> (raw)
In-Reply-To: <1438988284-8453-1-git-send-email-f.fainelli@gmail.com>
On Fri, Aug 07, 2015 at 03:58:02PM -0700, Florian Fainelli wrote:
> 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).
Is that really the best approach? I see other Makefiles that leave
PKG_CONFIG as a variable (which is fine), but not to allow full
override; they do something like:
PKG_CONFIG := $(CROSS_COMPILE)pkg-config
So, I suppose you could then alias your my-foo-cross-pkg-config to
/bin/false, or something like that.
Another alternative: supply empty $PKG_CONFIG_LIBDIR and
$PKG_CONFIG_PATH variables, so pkg-config finds nothing. (Bonus: no
patch needed here!)
Brian
> Fixes: 96a0d99c72cc ("tools/thermal: tmon: use pkg-config to determine library dependencies")
> Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
> ---
> 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
>
next prev parent reply other threads:[~2015-08-07 23:13 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-08-07 22:58 [PATCH] tools/thermal: tmon: Allow overriding pkg-config Florian Fainelli
2015-08-07 23:13 ` Brian Norris [this message]
2015-08-08 20:04 ` Florian Fainelli
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20150807231310.GE60523@google.com \
--to=computersforpeace@gmail.com \
--cc=f.fainelli@gmail.com \
--cc=gregory.0xf0@gmail.com \
--cc=jacob.jun.pan@linux.intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux.amoon@gmail.com \
--cc=rui.zhang@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.