* [PATCH] tools/lib/traceevent: Remove hardcoded install paths from pkg-config file
@ 2019-04-19 1:15 Steven Rostedt
2019-03-29 14:45 ` [PATCH v2] " Tzvetomir Stoyanov
2019-04-24 12:47 ` [PATCH] tools/lib/traceevent: Remove hardcoded " Steven Rostedt
0 siblings, 2 replies; 5+ messages in thread
From: Steven Rostedt @ 2019-04-19 1:15 UTC (permalink / raw)
To: Arnaldo Carvalho de Melo
Cc: Jiri Olsa, Tzvetomir Stoyanov, linux-trace-devel@vger.kernel.org,
LKML
From: Tzvetomir Stoyanov <tstoyanov@vmware.com>
Install directories of header and library files are hardcoded in pkg-config
templete file. They must be configurable, the Makefile should set them on the
compilation / install stage.
Link: http://lkml.kernel.org/r/20190329144546.5819-1-tstoyanov@vmware.com
Signed-off-by: Tzvetomir Stoyanov <tstoyanov@vmware.com>
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
---
tools/lib/traceevent/Makefile | 13 +++++++++----
tools/lib/traceevent/libtraceevent.pc.template | 4 ++--
2 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/tools/lib/traceevent/Makefile b/tools/lib/traceevent/Makefile
index 941761d9923d..34cf33a4f001 100644
--- a/tools/lib/traceevent/Makefile
+++ b/tools/lib/traceevent/Makefile
@@ -50,6 +50,9 @@ man_dir = $(prefix)/share/man
man_dir_SQ = '$(subst ','\'',$(man_dir))'
pkgconfig_dir ?= $(word 1,$(shell $(PKG_CONFIG) \
--variable pc_path pkg-config | tr ":" " "))
+includedir_relative = traceevent
+includedir = $(prefix)/include/$(includedir_relative)
+includedir_SQ = '$(subst ','\'',$(includedir))'
export man_dir man_dir_SQ INSTALL
export DESTDIR DESTDIR_SQ
@@ -279,6 +282,8 @@ define do_install_pkgconfig_file
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}; \
+ sed -i "s|LIB_DIR|${libdir}|g" ${PKG_CONFIG_FILE}; \
+ sed -i "s|HEADER_DIR|$(includedir)|g" ${PKG_CONFIG_FILE}; \
$(call do_install,$(PKG_CONFIG_FILE),$(pkgconfig_dir),644); \
else \
(echo Failed to locate pkg-config directory) 1>&2; \
@@ -300,10 +305,10 @@ install_pkgconfig:
install_headers:
$(call QUIET_INSTALL, headers) \
- $(call do_install,event-parse.h,$(prefix)/include/traceevent,644); \
- $(call do_install,event-utils.h,$(prefix)/include/traceevent,644); \
- $(call do_install,trace-seq.h,$(prefix)/include/traceevent,644); \
- $(call do_install,kbuffer.h,$(prefix)/include/traceevent,644)
+ $(call do_install,event-parse.h,$(DESTDIR)$(includedir_SQ),644); \
+ $(call do_install,event-utils.h,$(DESTDIR)$(includedir_SQ),644); \
+ $(call do_install,trace-seq.h,$(DESTDIR)$(includedir_SQ),644); \
+ $(call do_install,kbuffer.h,$(DESTDIR)$(includedir_SQ),644)
install: install_lib
diff --git a/tools/lib/traceevent/libtraceevent.pc.template b/tools/lib/traceevent/libtraceevent.pc.template
index 42e4d6cb6b9e..86384fcd57f1 100644
--- a/tools/lib/traceevent/libtraceevent.pc.template
+++ b/tools/lib/traceevent/libtraceevent.pc.template
@@ -1,6 +1,6 @@
prefix=INSTALL_PREFIX
-libdir=${prefix}/lib64
-includedir=${prefix}/include/traceevent
+libdir=LIB_DIR
+includedir=HEADER_DIR
Name: libtraceevent
URL: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
--
2.20.1
^ permalink raw reply related [flat|nested] 5+ messages in thread* [PATCH v2] tools/lib/traceevent: Remove hardcoded install paths from pkg-config file
@ 2019-03-29 14:45 ` Tzvetomir Stoyanov
2019-05-18 8:48 ` [tip:perf/core] tools lib traceevent: Remove hard coded " tip-bot for Tzvetomir Stoyanov
0 siblings, 1 reply; 5+ messages in thread
From: Tzvetomir Stoyanov @ 2019-03-29 14:45 UTC (permalink / raw)
To: rostedt; +Cc: linux-trace-devel, linux-kernel
Install directories of header and library files are hardcoded in pkg-config
templete file. They must be configurable, the Makefile should set them on the
compilation / install stage.
Signed-off-by: Tzvetomir Stoyanov <tstoyanov@vmware.com>
---
tools/lib/traceevent/Makefile | 13 +++++++++----
tools/lib/traceevent/libtraceevent.pc.template | 4 ++--
2 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/tools/lib/traceevent/Makefile b/tools/lib/traceevent/Makefile
index 67fe5d7ef190..6419a24058ab 100644
--- a/tools/lib/traceevent/Makefile
+++ b/tools/lib/traceevent/Makefile
@@ -50,6 +50,9 @@ man_dir = $(prefix)/share/man
man_dir_SQ = '$(subst ','\'',$(man_dir))'
pkgconfig_dir ?= $(word 1,$(shell $(PKG_CONFIG) \
--variable pc_path pkg-config | tr ":" " "))
+includedir_relative = traceevent
+includedir = $(prefix)/include/$(includedir_relative)
+includedir_SQ = '$(subst ','\'',$(includedir))'
export man_dir man_dir_SQ INSTALL
export DESTDIR DESTDIR_SQ
@@ -279,6 +282,8 @@ define do_install_pkgconfig_file
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}; \
+ sed -i "s|LIB_DIR|${libdir}|g" ${PKG_CONFIG_FILE}; \
+ sed -i "s|HEADER_DIR|$(includedir)|g" ${PKG_CONFIG_FILE}; \
$(call do_install,$(PKG_CONFIG_FILE),$(pkgconfig_dir),644); \
else \
(echo Failed to locate pkg-config directory) 1>&2; \
@@ -300,10 +305,10 @@ install_pkgconfig:
install_headers:
$(call QUIET_INSTALL, headers) \
- $(call do_install,event-parse.h,$(prefix)/include/traceevent,644); \
- $(call do_install,event-utils.h,$(prefix)/include/traceevent,644); \
- $(call do_install,trace-seq.h,$(prefix)/include/traceevent,644); \
- $(call do_install,kbuffer.h,$(prefix)/include/traceevent,644)
+ $(call do_install,event-parse.h,$(DESTDIR)$(includedir_SQ),644); \
+ $(call do_install,event-utils.h,$(DESTDIR)$(includedir_SQ),644); \
+ $(call do_install,trace-seq.h,$(DESTDIR)$(includedir_SQ),644); \
+ $(call do_install,kbuffer.h,$(DESTDIR)$(includedir_SQ),644)
install: install_lib
diff --git a/tools/lib/traceevent/libtraceevent.pc.template b/tools/lib/traceevent/libtraceevent.pc.template
index 42e4d6cb6b9e..86384fcd57f1 100644
--- a/tools/lib/traceevent/libtraceevent.pc.template
+++ b/tools/lib/traceevent/libtraceevent.pc.template
@@ -1,6 +1,6 @@
prefix=INSTALL_PREFIX
-libdir=${prefix}/lib64
-includedir=${prefix}/include/traceevent
+libdir=LIB_DIR
+includedir=HEADER_DIR
Name: libtraceevent
URL: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
--
2.20.1
^ permalink raw reply related [flat|nested] 5+ messages in thread* [tip:perf/core] tools lib traceevent: Remove hard coded install paths from pkg-config file
2019-03-29 14:45 ` [PATCH v2] " Tzvetomir Stoyanov
@ 2019-05-18 8:48 ` tip-bot for Tzvetomir Stoyanov
0 siblings, 0 replies; 5+ messages in thread
From: tip-bot for Tzvetomir Stoyanov @ 2019-05-18 8:48 UTC (permalink / raw)
To: linux-tip-commits
Cc: acme, mingo, rostedt, tglx, tstoyanov, jolsa, hpa, linux-kernel
Commit-ID: 53dbabfe50262eeebb56ce18789c3c885f15e6ac
Gitweb: https://git.kernel.org/tip/53dbabfe50262eeebb56ce18789c3c885f15e6ac
Author: Tzvetomir Stoyanov <tstoyanov@vmware.com>
AuthorDate: Thu, 18 Apr 2019 21:15:56 -0400
Committer: Arnaldo Carvalho de Melo <acme@redhat.com>
CommitDate: Wed, 15 May 2019 16:36:46 -0300
tools lib traceevent: Remove hard coded install paths from pkg-config file
Install directories of header and library files are hard coded in
pkg-config template file.
They must be configurable, the Makefile should set them on the
compilation / install stage.
Signed-off-by: Tzvetomir Stoyanov <tstoyanov@vmware.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Link: http://lkml.kernel.org/r/20190418211556.5a12adc3@oasis.local.home
Link: http://lkml.kernel.org/r/20190329144546.5819-1-tstoyanov@vmware.com
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
tools/lib/traceevent/Makefile | 13 +++++++++----
tools/lib/traceevent/libtraceevent.pc.template | 4 ++--
2 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/tools/lib/traceevent/Makefile b/tools/lib/traceevent/Makefile
index 941761d9923d..34cf33a4f001 100644
--- a/tools/lib/traceevent/Makefile
+++ b/tools/lib/traceevent/Makefile
@@ -50,6 +50,9 @@ man_dir = $(prefix)/share/man
man_dir_SQ = '$(subst ','\'',$(man_dir))'
pkgconfig_dir ?= $(word 1,$(shell $(PKG_CONFIG) \
--variable pc_path pkg-config | tr ":" " "))
+includedir_relative = traceevent
+includedir = $(prefix)/include/$(includedir_relative)
+includedir_SQ = '$(subst ','\'',$(includedir))'
export man_dir man_dir_SQ INSTALL
export DESTDIR DESTDIR_SQ
@@ -279,6 +282,8 @@ define do_install_pkgconfig_file
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}; \
+ sed -i "s|LIB_DIR|${libdir}|g" ${PKG_CONFIG_FILE}; \
+ sed -i "s|HEADER_DIR|$(includedir)|g" ${PKG_CONFIG_FILE}; \
$(call do_install,$(PKG_CONFIG_FILE),$(pkgconfig_dir),644); \
else \
(echo Failed to locate pkg-config directory) 1>&2; \
@@ -300,10 +305,10 @@ install_pkgconfig:
install_headers:
$(call QUIET_INSTALL, headers) \
- $(call do_install,event-parse.h,$(prefix)/include/traceevent,644); \
- $(call do_install,event-utils.h,$(prefix)/include/traceevent,644); \
- $(call do_install,trace-seq.h,$(prefix)/include/traceevent,644); \
- $(call do_install,kbuffer.h,$(prefix)/include/traceevent,644)
+ $(call do_install,event-parse.h,$(DESTDIR)$(includedir_SQ),644); \
+ $(call do_install,event-utils.h,$(DESTDIR)$(includedir_SQ),644); \
+ $(call do_install,trace-seq.h,$(DESTDIR)$(includedir_SQ),644); \
+ $(call do_install,kbuffer.h,$(DESTDIR)$(includedir_SQ),644)
install: install_lib
diff --git a/tools/lib/traceevent/libtraceevent.pc.template b/tools/lib/traceevent/libtraceevent.pc.template
index 42e4d6cb6b9e..86384fcd57f1 100644
--- a/tools/lib/traceevent/libtraceevent.pc.template
+++ b/tools/lib/traceevent/libtraceevent.pc.template
@@ -1,6 +1,6 @@
prefix=INSTALL_PREFIX
-libdir=${prefix}/lib64
-includedir=${prefix}/include/traceevent
+libdir=LIB_DIR
+includedir=HEADER_DIR
Name: libtraceevent
URL: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] tools/lib/traceevent: Remove hardcoded install paths from pkg-config file
2019-04-19 1:15 [PATCH] tools/lib/traceevent: Remove hardcoded install paths from pkg-config file Steven Rostedt
2019-03-29 14:45 ` [PATCH v2] " Tzvetomir Stoyanov
@ 2019-04-24 12:47 ` Steven Rostedt
2019-04-24 13:37 ` Arnaldo Carvalho de Melo
1 sibling, 1 reply; 5+ messages in thread
From: Steven Rostedt @ 2019-04-24 12:47 UTC (permalink / raw)
To: Arnaldo Carvalho de Melo
Cc: Jiri Olsa, Tzvetomir Stoyanov, linux-trace-devel@vger.kernel.org,
LKML
Hi Arnaldo,
Just making sure this doesn't get lost in the noise ;-)
Can you pull this in?
-- Steve
On Thu, 18 Apr 2019 21:15:56 -0400
Steven Rostedt <rostedt@goodmis.org> wrote:
> From: Tzvetomir Stoyanov <tstoyanov@vmware.com>
>
> Install directories of header and library files are hardcoded in pkg-config
> templete file. They must be configurable, the Makefile should set them on the
> compilation / install stage.
>
> Link: http://lkml.kernel.org/r/20190329144546.5819-1-tstoyanov@vmware.com
>
> Signed-off-by: Tzvetomir Stoyanov <tstoyanov@vmware.com>
> Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
> ---
> tools/lib/traceevent/Makefile | 13 +++++++++----
> tools/lib/traceevent/libtraceevent.pc.template | 4 ++--
> 2 files changed, 11 insertions(+), 6 deletions(-)
>
> diff --git a/tools/lib/traceevent/Makefile b/tools/lib/traceevent/Makefile
> index 941761d9923d..34cf33a4f001 100644
> --- a/tools/lib/traceevent/Makefile
> +++ b/tools/lib/traceevent/Makefile
> @@ -50,6 +50,9 @@ man_dir = $(prefix)/share/man
> man_dir_SQ = '$(subst ','\'',$(man_dir))'
> pkgconfig_dir ?= $(word 1,$(shell $(PKG_CONFIG) \
> --variable pc_path pkg-config | tr ":" " "))
> +includedir_relative = traceevent
> +includedir = $(prefix)/include/$(includedir_relative)
> +includedir_SQ = '$(subst ','\'',$(includedir))'
>
> export man_dir man_dir_SQ INSTALL
> export DESTDIR DESTDIR_SQ
> @@ -279,6 +282,8 @@ define do_install_pkgconfig_file
> 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}; \
> + sed -i "s|LIB_DIR|${libdir}|g" ${PKG_CONFIG_FILE}; \
> + sed -i "s|HEADER_DIR|$(includedir)|g" ${PKG_CONFIG_FILE}; \
> $(call do_install,$(PKG_CONFIG_FILE),$(pkgconfig_dir),644); \
> else \
> (echo Failed to locate pkg-config directory) 1>&2; \
> @@ -300,10 +305,10 @@ install_pkgconfig:
>
> install_headers:
> $(call QUIET_INSTALL, headers) \
> - $(call do_install,event-parse.h,$(prefix)/include/traceevent,644); \
> - $(call do_install,event-utils.h,$(prefix)/include/traceevent,644); \
> - $(call do_install,trace-seq.h,$(prefix)/include/traceevent,644); \
> - $(call do_install,kbuffer.h,$(prefix)/include/traceevent,644)
> + $(call do_install,event-parse.h,$(DESTDIR)$(includedir_SQ),644); \
> + $(call do_install,event-utils.h,$(DESTDIR)$(includedir_SQ),644); \
> + $(call do_install,trace-seq.h,$(DESTDIR)$(includedir_SQ),644); \
> + $(call do_install,kbuffer.h,$(DESTDIR)$(includedir_SQ),644)
>
> install: install_lib
>
> diff --git a/tools/lib/traceevent/libtraceevent.pc.template b/tools/lib/traceevent/libtraceevent.pc.template
> index 42e4d6cb6b9e..86384fcd57f1 100644
> --- a/tools/lib/traceevent/libtraceevent.pc.template
> +++ b/tools/lib/traceevent/libtraceevent.pc.template
> @@ -1,6 +1,6 @@
> prefix=INSTALL_PREFIX
> -libdir=${prefix}/lib64
> -includedir=${prefix}/include/traceevent
> +libdir=LIB_DIR
> +includedir=HEADER_DIR
>
> Name: libtraceevent
> URL: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH] tools/lib/traceevent: Remove hardcoded install paths from pkg-config file
2019-04-24 12:47 ` [PATCH] tools/lib/traceevent: Remove hardcoded " Steven Rostedt
@ 2019-04-24 13:37 ` Arnaldo Carvalho de Melo
0 siblings, 0 replies; 5+ messages in thread
From: Arnaldo Carvalho de Melo @ 2019-04-24 13:37 UTC (permalink / raw)
To: Steven Rostedt
Cc: Jiri Olsa, Tzvetomir Stoyanov, linux-trace-devel@vger.kernel.org,
LKML
Em Wed, Apr 24, 2019 at 08:47:22AM -0400, Steven Rostedt escreveu:
>
> Hi Arnaldo,
>
> Just making sure this doesn't get lost in the noise ;-)
>
> Can you pull this in?
Its already in my local repo, that I just pushed out, thanks!
- Arnaldo
> -- Steve
>
>
> On Thu, 18 Apr 2019 21:15:56 -0400
> Steven Rostedt <rostedt@goodmis.org> wrote:
>
> > From: Tzvetomir Stoyanov <tstoyanov@vmware.com>
> >
> > Install directories of header and library files are hardcoded in pkg-config
> > templete file. They must be configurable, the Makefile should set them on the
> > compilation / install stage.
> >
> > Link: http://lkml.kernel.org/r/20190329144546.5819-1-tstoyanov@vmware.com
> >
> > Signed-off-by: Tzvetomir Stoyanov <tstoyanov@vmware.com>
> > Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
> > ---
> > tools/lib/traceevent/Makefile | 13 +++++++++----
> > tools/lib/traceevent/libtraceevent.pc.template | 4 ++--
> > 2 files changed, 11 insertions(+), 6 deletions(-)
> >
> > diff --git a/tools/lib/traceevent/Makefile b/tools/lib/traceevent/Makefile
> > index 941761d9923d..34cf33a4f001 100644
> > --- a/tools/lib/traceevent/Makefile
> > +++ b/tools/lib/traceevent/Makefile
> > @@ -50,6 +50,9 @@ man_dir = $(prefix)/share/man
> > man_dir_SQ = '$(subst ','\'',$(man_dir))'
> > pkgconfig_dir ?= $(word 1,$(shell $(PKG_CONFIG) \
> > --variable pc_path pkg-config | tr ":" " "))
> > +includedir_relative = traceevent
> > +includedir = $(prefix)/include/$(includedir_relative)
> > +includedir_SQ = '$(subst ','\'',$(includedir))'
> >
> > export man_dir man_dir_SQ INSTALL
> > export DESTDIR DESTDIR_SQ
> > @@ -279,6 +282,8 @@ define do_install_pkgconfig_file
> > 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}; \
> > + sed -i "s|LIB_DIR|${libdir}|g" ${PKG_CONFIG_FILE}; \
> > + sed -i "s|HEADER_DIR|$(includedir)|g" ${PKG_CONFIG_FILE}; \
> > $(call do_install,$(PKG_CONFIG_FILE),$(pkgconfig_dir),644); \
> > else \
> > (echo Failed to locate pkg-config directory) 1>&2; \
> > @@ -300,10 +305,10 @@ install_pkgconfig:
> >
> > install_headers:
> > $(call QUIET_INSTALL, headers) \
> > - $(call do_install,event-parse.h,$(prefix)/include/traceevent,644); \
> > - $(call do_install,event-utils.h,$(prefix)/include/traceevent,644); \
> > - $(call do_install,trace-seq.h,$(prefix)/include/traceevent,644); \
> > - $(call do_install,kbuffer.h,$(prefix)/include/traceevent,644)
> > + $(call do_install,event-parse.h,$(DESTDIR)$(includedir_SQ),644); \
> > + $(call do_install,event-utils.h,$(DESTDIR)$(includedir_SQ),644); \
> > + $(call do_install,trace-seq.h,$(DESTDIR)$(includedir_SQ),644); \
> > + $(call do_install,kbuffer.h,$(DESTDIR)$(includedir_SQ),644)
> >
> > install: install_lib
> >
> > diff --git a/tools/lib/traceevent/libtraceevent.pc.template b/tools/lib/traceevent/libtraceevent.pc.template
> > index 42e4d6cb6b9e..86384fcd57f1 100644
> > --- a/tools/lib/traceevent/libtraceevent.pc.template
> > +++ b/tools/lib/traceevent/libtraceevent.pc.template
> > @@ -1,6 +1,6 @@
> > prefix=INSTALL_PREFIX
> > -libdir=${prefix}/lib64
> > -includedir=${prefix}/include/traceevent
> > +libdir=LIB_DIR
> > +includedir=HEADER_DIR
> >
> > Name: libtraceevent
> > URL: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2019-05-18 8:49 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-04-19 1:15 [PATCH] tools/lib/traceevent: Remove hardcoded install paths from pkg-config file Steven Rostedt
2019-03-29 14:45 ` [PATCH v2] " Tzvetomir Stoyanov
2019-05-18 8:48 ` [tip:perf/core] tools lib traceevent: Remove hard coded " tip-bot for Tzvetomir Stoyanov
2019-04-24 12:47 ` [PATCH] tools/lib/traceevent: Remove hardcoded " Steven Rostedt
2019-04-24 13:37 ` Arnaldo Carvalho de Melo
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.