| Message ID | 20191207111440.6574-1-sudipm.mukherjee@gmail.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | c09982f8e2bae80a66232630ec4ba50afacea486 |
| Headers | show |
| Series | libtraceevent: allow custom libdir path | expand |
Arnaldo, Can you pull this patch in? Reviewed-by: Steven Rostedt (VMware) <rostedt@goodmis.org> -- Steve On Sat, 7 Dec 2019 11:14:40 +0000 Sudip Mukherjee <sudipm.mukherjee@gmail.com> wrote: > When I use prefix=/usr and try to install libtraceevent in my laptop it > tries to install in /usr/lib64. I am not having any folder as /usr/lib64 > and also the debian policy doesnot allow installing in /usr/lib64. It > should be in /usr/lib/x86_64-linux-gnu/. > > Quote: No package for a 64 bit architecture may install files in > /usr/lib64/ or in a subdirectory of it. > ref: https://www.debian.org/doc/debian-policy/ch-opersys.html > > Make it more flexible by allowing to mention libdir_relative while > installing so that distros can mention the path according to their policy > or use the default one. > > Signed-off-by: Sudip Mukherjee <sudipm.mukherjee@gmail.com> > --- > > Hi Steve, > > And yet another one (hopefully the final one for now). I know I missed > the merge window, but your Ack should be ok. > > tools/lib/traceevent/Makefile | 5 +++-- > tools/lib/traceevent/plugins/Makefile | 5 +++-- > 2 files changed, 6 insertions(+), 4 deletions(-) > > diff --git a/tools/lib/traceevent/Makefile b/tools/lib/traceevent/Makefile > index c5a03356a999..7e2450ddd7e1 100644 > --- a/tools/lib/traceevent/Makefile > +++ b/tools/lib/traceevent/Makefile > @@ -39,11 +39,12 @@ DESTDIR_SQ = '$(subst ','\'',$(DESTDIR))' > > LP64 := $(shell echo __LP64__ | ${CC} ${CFLAGS} -E -x c - | tail -n 1) > ifeq ($(LP64), 1) > - libdir_relative = lib64 > + libdir_relative_temp = lib64 > else > - libdir_relative = lib > + libdir_relative_temp = lib > endif > > +libdir_relative ?= $(libdir_relative_temp) > prefix ?= /usr/local > libdir = $(prefix)/$(libdir_relative) > man_dir = $(prefix)/share/man > diff --git a/tools/lib/traceevent/plugins/Makefile b/tools/lib/traceevent/plugins/Makefile > index f440989fa55e..edb046151305 100644 > --- a/tools/lib/traceevent/plugins/Makefile > +++ b/tools/lib/traceevent/plugins/Makefile > @@ -32,11 +32,12 @@ DESTDIR_SQ = '$(subst ','\'',$(DESTDIR))' > > LP64 := $(shell echo __LP64__ | ${CC} ${CFLAGS} -E -x c - | tail -n 1) > ifeq ($(LP64), 1) > - libdir_relative = lib64 > + libdir_relative_tmp = lib64 > else > - libdir_relative = lib > + libdir_relative_tmp = lib > endif > > +libdir_relative ?= $(libdir_relative_tmp) > prefix ?= /usr/local > libdir = $(prefix)/$(libdir_relative) >
Em Thu, Dec 12, 2019 at 11:19:00AM -0500, Steven Rostedt escreveu: > > Arnaldo, > > Can you pull this patch in? > > Reviewed-by: Steven Rostedt (VMware) <rostedt@goodmis.org> Sure, applied. - Arnaldo > -- Steve > > > On Sat, 7 Dec 2019 11:14:40 +0000 > Sudip Mukherjee <sudipm.mukherjee@gmail.com> wrote: > > > When I use prefix=/usr and try to install libtraceevent in my laptop it > > tries to install in /usr/lib64. I am not having any folder as /usr/lib64 > > and also the debian policy doesnot allow installing in /usr/lib64. It > > should be in /usr/lib/x86_64-linux-gnu/. > > > > Quote: No package for a 64 bit architecture may install files in > > /usr/lib64/ or in a subdirectory of it. > > ref: https://www.debian.org/doc/debian-policy/ch-opersys.html > > > > Make it more flexible by allowing to mention libdir_relative while > > installing so that distros can mention the path according to their policy > > or use the default one. > > > > Signed-off-by: Sudip Mukherjee <sudipm.mukherjee@gmail.com> > > --- > > > > Hi Steve, > > > > And yet another one (hopefully the final one for now). I know I missed > > the merge window, but your Ack should be ok. > > > > tools/lib/traceevent/Makefile | 5 +++-- > > tools/lib/traceevent/plugins/Makefile | 5 +++-- > > 2 files changed, 6 insertions(+), 4 deletions(-) > > > > diff --git a/tools/lib/traceevent/Makefile b/tools/lib/traceevent/Makefile > > index c5a03356a999..7e2450ddd7e1 100644 > > --- a/tools/lib/traceevent/Makefile > > +++ b/tools/lib/traceevent/Makefile > > @@ -39,11 +39,12 @@ DESTDIR_SQ = '$(subst ','\'',$(DESTDIR))' > > > > LP64 := $(shell echo __LP64__ | ${CC} ${CFLAGS} -E -x c - | tail -n 1) > > ifeq ($(LP64), 1) > > - libdir_relative = lib64 > > + libdir_relative_temp = lib64 > > else > > - libdir_relative = lib > > + libdir_relative_temp = lib > > endif > > > > +libdir_relative ?= $(libdir_relative_temp) > > prefix ?= /usr/local > > libdir = $(prefix)/$(libdir_relative) > > man_dir = $(prefix)/share/man > > diff --git a/tools/lib/traceevent/plugins/Makefile b/tools/lib/traceevent/plugins/Makefile > > index f440989fa55e..edb046151305 100644 > > --- a/tools/lib/traceevent/plugins/Makefile > > +++ b/tools/lib/traceevent/plugins/Makefile > > @@ -32,11 +32,12 @@ DESTDIR_SQ = '$(subst ','\'',$(DESTDIR))' > > > > LP64 := $(shell echo __LP64__ | ${CC} ${CFLAGS} -E -x c - | tail -n 1) > > ifeq ($(LP64), 1) > > - libdir_relative = lib64 > > + libdir_relative_tmp = lib64 > > else > > - libdir_relative = lib > > + libdir_relative_tmp = lib > > endif > > > > +libdir_relative ?= $(libdir_relative_tmp) > > prefix ?= /usr/local > > libdir = $(prefix)/$(libdir_relative) > >
diff --git a/tools/lib/traceevent/Makefile b/tools/lib/traceevent/Makefile index c5a03356a999..7e2450ddd7e1 100644 --- a/tools/lib/traceevent/Makefile +++ b/tools/lib/traceevent/Makefile @@ -39,11 +39,12 @@ DESTDIR_SQ = '$(subst ','\'',$(DESTDIR))' LP64 := $(shell echo __LP64__ | ${CC} ${CFLAGS} -E -x c - | tail -n 1) ifeq ($(LP64), 1) - libdir_relative = lib64 + libdir_relative_temp = lib64 else - libdir_relative = lib + libdir_relative_temp = lib endif +libdir_relative ?= $(libdir_relative_temp) prefix ?= /usr/local libdir = $(prefix)/$(libdir_relative) man_dir = $(prefix)/share/man diff --git a/tools/lib/traceevent/plugins/Makefile b/tools/lib/traceevent/plugins/Makefile index f440989fa55e..edb046151305 100644 --- a/tools/lib/traceevent/plugins/Makefile +++ b/tools/lib/traceevent/plugins/Makefile @@ -32,11 +32,12 @@ DESTDIR_SQ = '$(subst ','\'',$(DESTDIR))' LP64 := $(shell echo __LP64__ | ${CC} ${CFLAGS} -E -x c - | tail -n 1) ifeq ($(LP64), 1) - libdir_relative = lib64 + libdir_relative_tmp = lib64 else - libdir_relative = lib + libdir_relative_tmp = lib endif +libdir_relative ?= $(libdir_relative_tmp) prefix ?= /usr/local libdir = $(prefix)/$(libdir_relative)
When I use prefix=/usr and try to install libtraceevent in my laptop it tries to install in /usr/lib64. I am not having any folder as /usr/lib64 and also the debian policy doesnot allow installing in /usr/lib64. It should be in /usr/lib/x86_64-linux-gnu/. Quote: No package for a 64 bit architecture may install files in /usr/lib64/ or in a subdirectory of it. ref: https://www.debian.org/doc/debian-policy/ch-opersys.html Make it more flexible by allowing to mention libdir_relative while installing so that distros can mention the path according to their policy or use the default one. Signed-off-by: Sudip Mukherjee <sudipm.mukherjee@gmail.com> --- Hi Steve, And yet another one (hopefully the final one for now). I know I missed the merge window, but your Ack should be ok. tools/lib/traceevent/Makefile | 5 +++-- tools/lib/traceevent/plugins/Makefile | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-)