linux-trace-devel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Tzvetomir Stoyanov <tstoyanov@vmware.com>
To: "rostedt@goodmis.org" <rostedt@goodmis.org>
Cc: "linux-trace-devel@vger.kernel.org" <linux-trace-devel@vger.kernel.org>
Subject: [PATCH v3 02/15] tools/lib/traceevent: Added support for pkg-config
Date: Wed, 28 Nov 2018 09:07:30 +0000	[thread overview]
Message-ID: <20181128090711.17792-3-tstoyanov@vmware.com> (raw)
In-Reply-To: <20181128090711.17792-1-tstoyanov@vmware.com>

This patch implements integration with pkg-config framework.
pkg-config can be used by the library users to determine
required CFLAGS and LDFLAGS in order to use the library

Signed-off-by: Tzvetomir Stoyanov <tstoyanov@vmware.com>
---
 tools/lib/traceevent/Makefile                 | 26 ++++++++++++++++---
 .../lib/traceevent/libtraceevent.pc.template  | 10 +++++++
 2 files changed, 33 insertions(+), 3 deletions(-)
 create mode 100644 tools/lib/traceevent/libtraceevent.pc.template

diff --git a/tools/lib/traceevent/Makefile b/tools/lib/traceevent/Makefile
index 0b4e833088a4..05ac0ec9bcd1 100644
--- a/tools/lib/traceevent/Makefile
+++ b/tools/lib/traceevent/Makefile
@@ -25,6 +25,7 @@ endef
 $(call allow-override,CC,$(CROSS_COMPILE)gcc)
 $(call allow-override,AR,$(CROSS_COMPILE)ar)
 $(call allow-override,NM,$(CROSS_COMPILE)nm)
+$(call allow-override,PKG_CONFIG,pkg-config)
 
 EXT = -std=gnu99
 INSTALL = install
@@ -47,6 +48,8 @@ prefix ?= /usr/local
 libdir = $(prefix)/$(libdir_relative)
 man_dir = $(prefix)/share/man
 man_dir_SQ = '$(subst ','\'',$(man_dir))'
+pkgconfig_dir ?= $(word 1,$(shell $(PKG_CONFIG) 		\
+			--variable pc_path pkg-config | tr ":" " "))
 
 export man_dir man_dir_SQ INSTALL
 export DESTDIR DESTDIR_SQ
@@ -270,7 +273,19 @@ define do_generate_dynamic_list_file
 	fi
 endef
 
-install_lib: all_cmd install_plugins
+PKG_CONFIG_FILE = libtraceevent.pc
+define do_install_pkgconfig_file
+	if [ -n "${pkgconfig_dir}" ]; then 					\
+		cp -f ${PKG_CONFIG_FILE}.template ${PKG_CONFIG_FILE}; 		\
+		sed -i "s|INSTALL_PREFIX|${1}|g" ${PKG_CONFIG_FILE}; 		\
+		sed -i "s|LIB_VERSION|${EVENT_PARSE_VERSION}|g" ${PKG_CONFIG_FILE}; \
+		$(call do_install,$(PKG_CONFIG_FILE),$(pkgconfig_dir),644); 	\
+	else 									\
+		(echo Failed to locate pkg-config directory) 1>&2;		\
+	fi	
+endef
+
+install_lib: all_cmd install_plugins install_pkgconfig
 	$(call QUIET_INSTALL, $(LIB_TARGET)) \
 		$(call do_install_mkdir,$(libdir_SQ)); \
 		cp -fpR $(LIB_INSTALL) $(DESTDIR)$(libdir_SQ)
@@ -279,6 +294,10 @@ install_plugins: $(PLUGINS)
 	$(call QUIET_INSTALL, trace_plugins) \
 		$(call do_install_plugins, $(PLUGINS))
 
+install_pkgconfig:
+	$(call QUIET_INSTALL, $(PKG_CONFIG_FILE)) \
+		$(call do_install_pkgconfig_file,$(prefix))
+
 install_headers:
 	$(call QUIET_INSTALL, headers) \
 		$(call do_install,event-parse.h,$(prefix)/include/traceevent,644); \
@@ -289,8 +308,9 @@ install: install_lib
 
 clean:
 	$(call QUIET_CLEAN, libtraceevent) \
-		$(RM) *.o *~ $(TARGETS) *.a *.so $(VERSION_FILES) .*.d .*.cmd \
-		$(RM) TRACEEVENT-CFLAGS tags TAGS
+		$(RM) *.o *~ $(TARGETS) *.a *.so $(VERSION_FILES) .*.d .*.cmd; \
+		$(RM) TRACEEVENT-CFLAGS tags TAGS; \
+		$(RM) $(PKG_CONFIG_FILE)
 
 PHONY += force plugins
 force:
diff --git a/tools/lib/traceevent/libtraceevent.pc.template b/tools/lib/traceevent/libtraceevent.pc.template
new file mode 100644
index 000000000000..42e4d6cb6b9e
--- /dev/null
+++ b/tools/lib/traceevent/libtraceevent.pc.template
@@ -0,0 +1,10 @@
+prefix=INSTALL_PREFIX
+libdir=${prefix}/lib64
+includedir=${prefix}/include/traceevent
+
+Name: libtraceevent
+URL: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
+Description: Linux kernel trace event library
+Version: LIB_VERSION
+Cflags: -I${includedir}
+Libs: -L${libdir} -ltraceevent
-- 
2.19.1

  parent reply	other threads:[~2018-11-28 20:08 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-11-28  9:07 [PATCH v3 00/15] tools/lib/traceevent,tools/perf: Various changes in libtraceevent APIs Tzvetomir Stoyanov
2018-11-28  9:07 ` [PATCH v3 01/15] tools/lib/traceevent: Implemented new API tep_get_ref() Tzvetomir Stoyanov
2018-11-28 20:01   ` Steven Rostedt
2018-11-28  9:07 ` Tzvetomir Stoyanov [this message]
2018-11-28 20:14   ` [PATCH v3 02/15] tools/lib/traceevent: Added support for pkg-config Steven Rostedt
2018-11-28 20:15     ` Steven Rostedt
2018-11-28  9:07 ` [PATCH v3 03/15] tools/lib/traceevent: Install trace-seq.h API header file Tzvetomir Stoyanov
2018-11-28  9:07 ` [PATCH v3 04/15] tools/lib/traceevent, tools/perf: Rename struct tep_event_format to struct tep_event Tzvetomir Stoyanov
2018-11-28  9:07 ` [PATCH v3 05/15] tools/lib/traceevent: Rename tep_free_format() to tep_free_event() Tzvetomir Stoyanov
2018-11-28  9:07 ` [PATCH v3 06/15] tools/perf: traceevent API cleanup, remove __tep_data2host*() Tzvetomir Stoyanov
2018-11-28  9:07 ` [PATCH v3 07/15] tools/lib/traceevent: traceevent API cleanup Tzvetomir Stoyanov
2018-11-28  9:07 ` [PATCH v3 08/15] tools/lib/traceevent: Introduce new libtracevent API: tep_override_comm() Tzvetomir Stoyanov
2018-11-28  9:07 ` [PATCH v3 09/15] tools/lib/traceevent: Initialize host_bigendian at tep_handle allocation Tzvetomir Stoyanov
2018-11-28  9:07 ` [PATCH v3 10/15] tools/lib/traceevent: Rename struct cmdline to struct tep_cmdline Tzvetomir Stoyanov
2018-11-28  9:07 ` [PATCH v3 11/15] tools/lib/traceevent: Changed return logic of trace_seq_printf() and trace_seq_vprintf() APIs Tzvetomir Stoyanov
2018-11-28  9:07 ` [PATCH v3 12/15] tools/lib/traceevent: Changed return logic of tep_register_event_handler() API Tzvetomir Stoyanov
2018-11-28  9:07 ` [PATCH v3 13/15] tools/lib/traceevent: Rename tep_is_file_bigendian() to tep_file_bigendian() Tzvetomir Stoyanov
2018-11-28  9:07 ` [PATCH v3 14/15] tools/lib/traceevent: Change description of few APIs Tzvetomir Stoyanov
2018-12-01  3:43   ` Steven Rostedt
2018-12-01  3:58     ` Steven Rostedt
2019-03-13 15:56       ` Steven Rostedt
2018-11-28  9:07 ` [PATCH v3 15/15] tools/lib/traceevent: Remove tep_data_event_from_type() API Tzvetomir Stoyanov

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=20181128090711.17792-3-tstoyanov@vmware.com \
    --to=tstoyanov@vmware.com \
    --cc=linux-trace-devel@vger.kernel.org \
    --cc=rostedt@goodmis.org \
    /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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).