| Message ID | 20190508132440.7388-1-apw@canonical.com |
|---|---|
| State | New |
| Headers | show |
| Series | [SRU,disco/master-next,1/1] UBUNTU: SAUCE: tools -- fix add ability to disable libbfd | expand |
On Wed, May 08, 2019 at 02:24:40PM +0100, Andy Whitcroft wrote: > In commit 14541b1e7e ("perf build: Don't unconditionally link the libbfd > feature test to -liberty and -lz") the enablement code changed radically > neutering our override. Adapt to that new form. > > Fixes: 546d50456e ("UBUNTU: SAUCE: tools -- add ability to disable libbfd") > Signed-off-by: Andy Whitcroft <apw@canonical.com> Looks fine to me, but do you have a bug link?
On 8.5.2019 17.27, Seth Forshee wrote: > On Wed, May 08, 2019 at 02:24:40PM +0100, Andy Whitcroft wrote: >> In commit 14541b1e7e ("perf build: Don't unconditionally link the libbfd >> feature test to -liberty and -lz") the enablement code changed radically >> neutering our override. Adapt to that new form. >> >> Fixes: 546d50456e ("UBUNTU: SAUCE: tools -- add ability to disable libbfd") >> Signed-off-by: Andy Whitcroft <apw@canonical.com> > > Looks fine to me, but do you have a bug link? This is what's blocking linux-oem-osp1 from entering eoan, should I file a bug for that?
On 5/8/19 10:52 AM, Timo Aaltonen wrote: > On 8.5.2019 17.27, Seth Forshee wrote: >> On Wed, May 08, 2019 at 02:24:40PM +0100, Andy Whitcroft wrote: >>> In commit 14541b1e7e ("perf build: Don't unconditionally link the libbfd >>> feature test to -liberty and -lz") the enablement code changed radically >>> neutering our override. Adapt to that new form. >>> >>> Fixes: 546d50456e ("UBUNTU: SAUCE: tools -- add ability to disable libbfd") >>> Signed-off-by: Andy Whitcroft <apw@canonical.com> >> >> Looks fine to me, but do you have a bug link? > > This is what's blocking linux-oem-osp1 from entering eoan, should I file > a bug for that? > > https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1826410
On 5/8/19 3:24 PM, Andy Whitcroft wrote: > In commit 14541b1e7e ("perf build: Don't unconditionally link the libbfd > feature test to -liberty and -lz") the enablement code changed radically > neutering our override. Adapt to that new form. > > Fixes: 546d50456e ("UBUNTU: SAUCE: tools -- add ability to disable libbfd") > Signed-off-by: Andy Whitcroft <apw@canonical.com> With the BugLink added: Acked-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com> > --- > tools/perf/Makefile.config | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) > > diff --git a/tools/perf/Makefile.config b/tools/perf/Makefile.config > index ecdd0e8c5e6d..67848a73a661 100644 > --- a/tools/perf/Makefile.config > +++ b/tools/perf/Makefile.config > @@ -702,7 +702,8 @@ endif > > ifdef HAVE_NO_LIBBFD > feature-libbfd := 0 > -endif > + $(info libbfd overidden OFF) > +else > > ifeq ($(feature-libbfd), 1) > EXTLIBS += -lbfd > @@ -724,6 +725,8 @@ else > endif > endif > > +endif > + > ifdef NO_DEMANGLE > CFLAGS += -DNO_DEMANGLE > else >
On 08.05.19 15:24, Andy Whitcroft wrote: > In commit 14541b1e7e ("perf build: Don't unconditionally link the libbfd > feature test to -liberty and -lz") the enablement code changed radically > neutering our override. Adapt to that new form. > BugLink: https://bugs.launchpad.net/bugs/1826410 > Fixes: 546d50456e ("UBUNTU: SAUCE: tools -- add ability to disable libbfd") > Signed-off-by: Andy Whitcroft <apw@canonical.com> Acked-by: Stefan Bader <stefan.bader@canonical.com> > --- > tools/perf/Makefile.config | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) > > diff --git a/tools/perf/Makefile.config b/tools/perf/Makefile.config > index ecdd0e8c5e6d..67848a73a661 100644 > --- a/tools/perf/Makefile.config > +++ b/tools/perf/Makefile.config > @@ -702,7 +702,8 @@ endif > > ifdef HAVE_NO_LIBBFD > feature-libbfd := 0 > -endif > + $(info libbfd overidden OFF) > +else > > ifeq ($(feature-libbfd), 1) > EXTLIBS += -lbfd > @@ -724,6 +725,8 @@ else > endif > endif > > +endif > + > ifdef NO_DEMANGLE > CFLAGS += -DNO_DEMANGLE > else >
On 5/8/19 3:24 PM, Andy Whitcroft wrote: > In commit 14541b1e7e ("perf build: Don't unconditionally link the libbfd > feature test to -liberty and -lz") the enablement code changed radically > neutering our override. Adapt to that new form. > > Fixes: 546d50456e ("UBUNTU: SAUCE: tools -- add ability to disable libbfd") > Signed-off-by: Andy Whitcroft <apw@canonical.com> > --- > tools/perf/Makefile.config | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) > > diff --git a/tools/perf/Makefile.config b/tools/perf/Makefile.config > index ecdd0e8c5e6d..67848a73a661 100644 > --- a/tools/perf/Makefile.config > +++ b/tools/perf/Makefile.config > @@ -702,7 +702,8 @@ endif > > ifdef HAVE_NO_LIBBFD > feature-libbfd := 0 > -endif > + $(info libbfd overidden OFF) > +else > > ifeq ($(feature-libbfd), 1) > EXTLIBS += -lbfd > @@ -724,6 +725,8 @@ else > endif > endif > > +endif > + > ifdef NO_DEMANGLE > CFLAGS += -DNO_DEMANGLE > else > Applied to disco/master-next branch, with the BugLink added. Thanks, Kleber
On Wed, May 08, 2019 at 02:24:40PM +0100, Andy Whitcroft wrote: > In commit 14541b1e7e ("perf build: Don't unconditionally link the libbfd > feature test to -liberty and -lz") the enablement code changed radically > neutering our override. Adapt to that new form. > > Fixes: 546d50456e ("UBUNTU: SAUCE: tools -- add ability to disable libbfd") > Signed-off-by: Andy Whitcroft <apw@canonical.com> Applied to unstable/master, with bug link added. Thanks!
diff --git a/tools/perf/Makefile.config b/tools/perf/Makefile.config index ecdd0e8c5e6d..67848a73a661 100644 --- a/tools/perf/Makefile.config +++ b/tools/perf/Makefile.config @@ -702,7 +702,8 @@ endif ifdef HAVE_NO_LIBBFD feature-libbfd := 0 -endif + $(info libbfd overidden OFF) +else ifeq ($(feature-libbfd), 1) EXTLIBS += -lbfd @@ -724,6 +725,8 @@ else endif endif +endif + ifdef NO_DEMANGLE CFLAGS += -DNO_DEMANGLE else
In commit 14541b1e7e ("perf build: Don't unconditionally link the libbfd feature test to -liberty and -lz") the enablement code changed radically neutering our override. Adapt to that new form. Fixes: 546d50456e ("UBUNTU: SAUCE: tools -- add ability to disable libbfd") Signed-off-by: Andy Whitcroft <apw@canonical.com> --- tools/perf/Makefile.config | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)