All of lore.kernel.org
 help / color / mirror / Atom feed
From: Brian Norris <computersforpeace@gmail.com>
To: Zhang Rui <rui.zhang@intel.com>, jacob.jun.pan@linux.intel.com
Cc: Neil Horman <nhorman@tuxdriver.com>,
	Brian Norris <computersforpeace@gmail.com>,
	Javi Merino <javi.merino@arm.com>,
	Florian Fainelli <f.fainelli@gmail.com>,
	linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org
Subject: [PATCH 7/8] tools/thermal: tmon: use pkg-config to determine library dependencies
Date: Tue, 17 Feb 2015 18:18:35 -0800	[thread overview]
Message-ID: <1424225916-13488-8-git-send-email-computersforpeace@gmail.com> (raw)
In-Reply-To: <1424225916-13488-1-git-send-email-computersforpeace@gmail.com>

Some distros (e.g., Arch Linux) don't package the tinfo library
separately from ncurses, so don't unconditionally include it. Instead,
use pkg-config.

The $(STATIC) ugliness is to handle the reported build case from commit
6b533269fb25 ("tools/thermal: tmon: fix compilation errors when building
statically"), where a developer wants to be able to build with:

  make LDFLAGS=-static

which requires an additional pkg-config flag.

Finally, support a lowest common denominator fallback (-lpanel
-lncurses) for build systems that don't have pkg-config entries for
ncurses.

Signed-off-by: Brian Norris <computersforpeace@gmail.com>
---
 tools/thermal/tmon/Makefile | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/tools/thermal/tmon/Makefile b/tools/thermal/tmon/Makefile
index 13d1876c7889..0788621c8d76 100644
--- a/tools/thermal/tmon/Makefile
+++ b/tools/thermal/tmon/Makefile
@@ -16,12 +16,21 @@ INSTALL_CONFIGFILE=install -m 644 -p
 CONFIG_FILE=
 CONFIG_PATH=
 
+# Static builds might require -ltinfo, for instance
+ifneq ($(findstring -static, $(LDFLAGS)),)
+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 || \
+		     echo -lpanel -lncurses)
 
 OBJS = tmon.o tui.o sysfs.o pid.o
 OBJS +=
 
 tmon: $(OBJS) Makefile tmon.h
-	$(CC) ${CFLAGS} $(LDFLAGS) $(OBJS)  -o $(TARGET) -lm -lpanel -lncursesw -ltinfo -lpthread
+	$(CC) $(CFLAGS) $(LDFLAGS) $(OBJS)  -o $(TARGET) $(TMON_LIBS)
 
 valgrind: tmon
 	 sudo valgrind -v --track-origins=yes --tool=memcheck --leak-check=yes --show-reachable=yes --num-callers=20 --track-fds=yes ./$(TARGET)  1> /dev/null
-- 
1.9.1

WARNING: multiple messages have this Message-ID (diff)
From: Brian Norris <computersforpeace@gmail.com>
To: Zhang Rui <rui.zhang@intel.com>, <jacob.jun.pan@linux.intel.com>
Cc: Neil Horman <nhorman@tuxdriver.com>,
	Brian Norris <computersforpeace@gmail.com>,
	Javi Merino <javi.merino@arm.com>,
	Florian Fainelli <f.fainelli@gmail.com>,
	<linux-kernel@vger.kernel.org>, <linux-pm@vger.kernel.org>
Subject: [PATCH 7/8] tools/thermal: tmon: use pkg-config to determine library dependencies
Date: Tue, 17 Feb 2015 18:18:35 -0800	[thread overview]
Message-ID: <1424225916-13488-8-git-send-email-computersforpeace@gmail.com> (raw)
In-Reply-To: <1424225916-13488-1-git-send-email-computersforpeace@gmail.com>

Some distros (e.g., Arch Linux) don't package the tinfo library
separately from ncurses, so don't unconditionally include it. Instead,
use pkg-config.

The $(STATIC) ugliness is to handle the reported build case from commit
6b533269fb25 ("tools/thermal: tmon: fix compilation errors when building
statically"), where a developer wants to be able to build with:

  make LDFLAGS=-static

which requires an additional pkg-config flag.

Finally, support a lowest common denominator fallback (-lpanel
-lncurses) for build systems that don't have pkg-config entries for
ncurses.

Signed-off-by: Brian Norris <computersforpeace@gmail.com>
---
 tools/thermal/tmon/Makefile | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/tools/thermal/tmon/Makefile b/tools/thermal/tmon/Makefile
index 13d1876c7889..0788621c8d76 100644
--- a/tools/thermal/tmon/Makefile
+++ b/tools/thermal/tmon/Makefile
@@ -16,12 +16,21 @@ INSTALL_CONFIGFILE=install -m 644 -p
 CONFIG_FILE=
 CONFIG_PATH=
 
+# Static builds might require -ltinfo, for instance
+ifneq ($(findstring -static, $(LDFLAGS)),)
+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 || \
+		     echo -lpanel -lncurses)
 
 OBJS = tmon.o tui.o sysfs.o pid.o
 OBJS +=
 
 tmon: $(OBJS) Makefile tmon.h
-	$(CC) ${CFLAGS} $(LDFLAGS) $(OBJS)  -o $(TARGET) -lm -lpanel -lncursesw -ltinfo -lpthread
+	$(CC) $(CFLAGS) $(LDFLAGS) $(OBJS)  -o $(TARGET) $(TMON_LIBS)
 
 valgrind: tmon
 	 sudo valgrind -v --track-origins=yes --tool=memcheck --leak-check=yes --show-reachable=yes --num-callers=20 --track-fds=yes ./$(TARGET)  1> /dev/null
-- 
1.9.1


  parent reply	other threads:[~2015-02-18  2:18 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-02-18  2:18 [PATCH 0/8] tools/thermal: tmon: UI and build system improvements Brian Norris
2015-02-18  2:18 ` Brian Norris
2015-02-18  2:18 ` [PATCH 1/8] tools/thermal: tmon: add --target-temp parameter Brian Norris
2015-02-18  2:18   ` Brian Norris
2015-02-18  2:18 ` [PATCH 2/8] tools/thermal: tmon: add min/max macros Brian Norris
2015-02-18  2:18   ` Brian Norris
2015-02-18  2:18 ` [PATCH 3/8] tools/thermal: tmon: tui: don't hard-code dialog window size assumptions Brian Norris
2015-02-18  2:18   ` Brian Norris
2015-02-18  2:18 ` [PATCH 4/8] tools/thermal: tmon: fixup tui windowing calculations Brian Norris
2015-02-18  2:18   ` Brian Norris
2015-02-18  2:18 ` [PATCH 5/8] tools/thermal: tmon: add .gitignore Brian Norris
2015-02-18  2:18   ` Brian Norris
2015-02-18  2:18 ` [PATCH 6/8] tools/thermal: tmon: support cross-compiling Brian Norris
2015-02-18  2:18   ` Brian Norris
2015-02-18  2:18 ` Brian Norris [this message]
2015-02-18  2:18   ` [PATCH 7/8] tools/thermal: tmon: use pkg-config to determine library dependencies Brian Norris
2015-02-18  2:18 ` [PATCH 8/8] tools/thermal: tmon: silence 'set but not used' warnings Brian Norris
2015-02-18  2:18   ` Brian Norris
2015-02-18  6:02 ` [PATCH 0/8] tools/thermal: tmon: UI and build system improvements Jacob Pan
2015-02-18  6:02   ` Jacob Pan
2015-02-18 17:49 ` 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=1424225916-13488-8-git-send-email-computersforpeace@gmail.com \
    --to=computersforpeace@gmail.com \
    --cc=f.fainelli@gmail.com \
    --cc=jacob.jun.pan@linux.intel.com \
    --cc=javi.merino@arm.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-pm@vger.kernel.org \
    --cc=nhorman@tuxdriver.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.