[SRU,disco/master-next,1/1] UBUNTU: SAUCE: tools -- fix add ability to disable libbfd
diff mbox series

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
Related show

Commit Message

Andy Whitcroft May 8, 2019, 1:24 p.m. UTC
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(-)

Comments

Seth Forshee May 8, 2019, 2:27 p.m. UTC | #1
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?
Timo Aaltonen May 8, 2019, 4:52 p.m. UTC | #2
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?
Terry Rudd May 8, 2019, 4:59 p.m. UTC | #3
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
Kleber Souza May 14, 2019, 8:51 a.m. UTC | #4
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
>
Stefan Bader May 14, 2019, 9:22 a.m. UTC | #5
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
>
Kleber Souza May 14, 2019, 9:54 a.m. UTC | #6
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
Seth Forshee May 14, 2019, 12:13 p.m. UTC | #7
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!

Patch
diff mbox series

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