| Message ID | 20190510200105.966709757@goodmis.org (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
| Series | tools/lib/traceevent: Add man pages for most libtraceevent functions | expand |
On Fri, 10 May 2019 15:56:07 -0400 Steven Rostedt <rostedt@goodmis.org> wrote: > From: Tzvetomir Stoyanov <tstoyanov@vmware.com> > > 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> Bah! I based my patch series off of the wrong commit, and ended up including this one in this series. Arnaldo, I believe you already applied patch 1 (otherwise I would not have your SOB on it), please ignore. But patch 2 on are new to be applied. Thanks! -- Steve > --- > tools/lib/traceevent/Makefile | 13 +++++++++---- > tools/lib/traceevent/libtraceevent.pc.template | 4 ++-- > 2 files changed, 11 insertions(+), 6 deletions(-)
On May 10, 2019 4:11:50 PM AST, Steven Rostedt <rostedt@goodmis.org> wrote: >On Fri, 10 May 2019 15:56:07 -0400 >Steven Rostedt <rostedt@goodmis.org> wrote: > >> From: Tzvetomir Stoyanov <tstoyanov@vmware.com> >> >> 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> > >Bah! > >I based my patch series off of the wrong commit, and ended up including >this one in this series. > >Arnaldo, > >I believe you already applied patch 1 (otherwise I would not have your >SOB on it), please ignore. But patch 2 on are new to be applied. Ok, I'll be back at work early next week and will peixes this, - Arnaldo > >Thanks! > >-- Steve > >> --- >> tools/lib/traceevent/Makefile | 13 +++++++++---- >> tools/lib/traceevent/libtraceevent.pc.template | 4 ++-- >> 2 files changed, 11 insertions(+), 6 deletions(-)
Em Fri, May 10, 2019 at 05:25:10PM -0400, Arnaldo Carvalho de Melo escreveu: > On May 10, 2019 4:11:50 PM AST, Steven Rostedt <rostedt@goodmis.org> wrote: > >On Fri, 10 May 2019 15:56:07 -0400 > >Steven Rostedt <rostedt@goodmis.org> wrote: > > > >> From: Tzvetomir Stoyanov <tstoyanov@vmware.com> > >> > >> 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> > > > >Bah! > > > >I based my patch series off of the wrong commit, and ended up including > >this one in this series. > > > >Arnaldo, > > > >I believe you already applied patch 1 (otherwise I would not have your > >SOB on it), please ignore. But patch 2 on are new to be applied. > > > Ok, I'll be back at work early next week and will peixes this, Done. - Arnaldo
On Tue, 14 May 2019 12:05:24 -0300 Arnaldo Carvalho de Melo <arnaldo.melo@gmail.com> wrote: > > >Arnaldo, > > > > > >I believe you already applied patch 1 (otherwise I would not have your > > >SOB on it), please ignore. But patch 2 on are new to be applied. > > > > > > Ok, I'll be back at work early next week and will peixes this, > > Done. Thanks Arnaldo! -- Steve
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