From: Patrick McLean <chutzpah@gentoo.org>
To: Steven Rostedt <rostedt@goodmis.org>
Cc: linux-trace-devel@vger.kernel.org
Subject: Re: [PATCH 2/4] trace-cmd: No automagic dependency on udis86
Date: Tue, 23 Jul 2019 10:41:02 -0700 [thread overview]
Message-ID: <20190723104102.4f11cee4@patrickm> (raw)
In-Reply-To: <20190719231701.0e2c901e@oasis.local.home>
On Fri, 19 Jul 2019 23:17:01 -0400
Steven Rostedt <rostedt@goodmis.org> wrote:
> Hi Patrick,
>
> Thanks for sending these. Some questions below.
>
> On Fri, 19 Jul 2019 20:03:42 -0700
> Patrick McLean <chutzpah@gentoo.org> wrote:
>
> > From: Patrick McLean <patrick.mclean@sony.com>
> >
> > Currently if udis86 is detected on the system, trace-cmd
> > automatically uses it. This is generally a problem for packagers
> > since if the build machine happens to have udis86, now there is a
> > dependency on it that may or may not be tracked.
> >
> > This adds a NO_UDIS86 variable that can be set by the packager to
> > disable using udis86 completely.
> >
> > Signed-off-by: Patrick McLean <patrick.mclean@sony.com>
> > ---
> > Makefile | 8 +++++++-
> > 1 file changed, 7 insertions(+), 1 deletion(-)
> >
> > diff --git a/Makefile b/Makefile
> > index 3579f27..6b85e21 100644
> > --- a/Makefile
> > +++ b/Makefile
> > @@ -136,8 +136,13 @@ export NO_PYTHON
> > test-build = $(if $(shell sh -c 'echo "$(1)" | \
> > $(CC) -o /dev/null -c -x c - > /dev/null 2>&1 && echo y'),
> > $2)
> > +ifndef NO_UDIS86
> > # have udis86 disassembler library?
> > -udis86-flags := $(call test-build,\#include
> > <udis86.h>,-DHAVE_UDIS86 -ludis86) +udis86-flags := -DHAVE_UDIS86
> > +udis86-ldflags := -ludis86
>
> Can we keep the test here? If NO_UDIS86 is not defined. That is, if
> you compile without this define, this change assumes you have it.
>
> It's fine to force not having it, but we shouldn't force having it if
> we don't.
That sounds good to me, preserve the current behaviour if nothing is
defined. I will attach an updated patch.
> > +else
> > +udis86-flags := -UHAVE_UDIS86
>
> I'm not sure this is needed, We shouldn't have anything defining
> HAVE_UDIS86.
Sure, I will drop it.
From: Patrick McLean <patrick.mclean@sony.com>
Currently if udis86 is detected on the system, trace-cmd automatically
uses it. This is generally a problem for packagers since if the build
machine happens to have udis86, now there is a dependency on it that may
or may not be tracked.
This adds a NO_UDIS86 variable that can be set by the packager to
disable using udis86 completely.
Signed-off-by: Patrick McLean <patrick.mclean@sony.com>
---
Makefile | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/Makefile b/Makefile
index 3579f27..ee3d8d9 100644
--- a/Makefile
+++ b/Makefile
@@ -136,8 +136,11 @@ export NO_PYTHON
test-build = $(if $(shell sh -c 'echo "$(1)" | \
$(CC) -o /dev/null -c -x c - > /dev/null 2>&1 && echo y'), $2)
+ifndef NO_UDIS86
# have udis86 disassembler library?
udis86-flags := $(call test-build,\#include <udis86.h>,-DHAVE_UDIS86 -ludis86)
+udis86-ldflags := -ludis86
+endif # NO_UDIS86
define BLK_TC_FLUSH_SOURCE
#include <linux/blktrace_api.h>
@@ -237,6 +240,7 @@ endif
# Append required CFLAGS
override CFLAGS += $(INCLUDES) $(PLUGIN_DIR_SQ) $(VAR_DIR)
override CFLAGS += $(udis86-flags) $(blk-flags)
+override LDFLAGS += $(udis86-ldflags)
CMD_TARGETS = trace-cmd $(BUILD_PYTHON)
--
2.22.0
next prev parent reply other threads:[~2019-07-23 17:41 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-20 3:03 [PATCH 0/4] trace-cmd: Fixes for packaging Patrick McLean
2019-07-20 3:03 ` [PATCH 1/4] trace-cmd: Allow overriding of python installation directory Patrick McLean
2019-07-20 3:03 ` [PATCH 2/4] trace-cmd: No automagic dependency on udis86 Patrick McLean
2019-07-20 3:17 ` Steven Rostedt
2019-07-23 17:41 ` Patrick McLean [this message]
2019-07-20 3:03 ` [PATCH 3/4] trace-cmd: Install all headers needed by kernelshark to proper paths Patrick McLean
2019-07-20 3:03 ` [PATCH 4/4] trace-cmd: Set SONAME on shared libraries Patrick McLean
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=20190723104102.4f11cee4@patrickm \
--to=chutzpah@gentoo.org \
--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).