[Bionic] [PATCH 0/2] LP#1748922 -- disable libbfd again

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
4 messages Options
Reply | Threaded
Open this post in threaded view
|

[Bionic] [PATCH 0/2] LP#1748922 -- disable libbfd again

Andy Whitcroft-3
Around oneiric we disabled the use of libbfd in perf.  This was to avoid a
versioned dependency and at the time at least to avoid a licensing issue.
Since then upstream has changed the controls and this no longer works.
Because the tools just drop back to libbfd we have continued to produce
functional binaries.

Following this email are two patches to fix this.  They add a new
control to the upstream code.  This allows us to ensure that libbfd is
turned off.  They additionally flip us over to a renamed control for
the mangler name.

Proposing for bionic.

-apw

Andy Whitcroft (2):
  UBUNTU: SAUCE: tools -- add ability to disable libbfd
  UBUNTU: [Packaging] correct disablement of libbfd

 debian/rules.d/2-binary-arch.mk | 2 +-
 tools/perf/Makefile.config      | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

--
2.15.1


--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

[PATCH 1/2] UBUNTU: SAUCE: tools -- add ability to disable libbfd

Andy Whitcroft-3
We do not want to be linked to libbfd as this is a tightly versioned
package which does not maintain its ABI.  This prevents us from have
multiple tools packages installed.  Turn that off and we will fallback
to libiberty.

BugLink: http://bugs.launchpad.net/bugs/1748922
Signed-off-by: Andy Whitcroft <[hidden email]>
---
 tools/perf/Makefile.config | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tools/perf/Makefile.config b/tools/perf/Makefile.config
index 0294bfb6c5f8..3ec1969b6d3e 100644
--- a/tools/perf/Makefile.config
+++ b/tools/perf/Makefile.config
@@ -649,6 +649,10 @@ else
   endif
 endif
 
+ifdef HAVE_NO_LIBBFD
+  feature-libbfd := 0
+endif
+
 ifeq ($(feature-libbfd), 1)
   EXTLIBS += -lbfd
 
--
2.15.1


--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

[PATCH 2/2] UBUNTU: [Packaging] correct disablement of libbfd

Andy Whitcroft-3
In reply to this post by Andy Whitcroft-3
We used to use HAVE_CPLUS_DEMANGLE to disable libbfd.  Upstream has changed
but the name of this control and its semantics.  It now only switches us
to use the c++ demangler and only then if libbfd is disabled.

Use the newly added HAVE_NO_LIBBFD to switch off libbfd and switch to
the new name of the c++ demangle selector.

BugLink: http://bugs.launchpad.net/bugs/1748922
Signed-off-by: Andy Whitcroft <[hidden email]>
---
 debian/rules.d/2-binary-arch.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/rules.d/2-binary-arch.mk b/debian/rules.d/2-binary-arch.mk
index 708a3ac17fa0..73cc0bc50274 100644
--- a/debian/rules.d/2-binary-arch.mk
+++ b/debian/rules.d/2-binary-arch.mk
@@ -636,7 +636,7 @@ ifeq ($(do_tools_perf),true)
  cd $(builddirpa) && $(kmake) silentoldconfig
  cd $(builddirpa) && $(kmake) prepare
  cd $(builddirpa)/tools/perf && \
- $(kmake) prefix=/usr HAVE_CPLUS_DEMANGLE=1 CROSS_COMPILE=$(CROSS_COMPILE) NO_LIBPYTHON=1 NO_LIBPERL=1 PYTHON=python2.7
+ $(kmake) prefix=/usr HAVE_NO_LIBBFD=1 HAVE_CPUS_DEMANGLE_SUPPORT=1 CROSS_COMPILE=$(CROSS_COMPILE) NO_LIBPYTHON=1 NO_LIBPERL=1 PYTHON=python2.7
 endif
 ifeq ($(do_tools_x86),true)
  cd $(builddirpa)/tools/power/x86/x86_energy_perf_policy && make CROSS_COMPILE=$(CROSS_COMPILE)
--
2.15.1


--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

APPLIED: [Bionic] [PATCH 0/2] LP#1748922 -- disable libbfd again

Seth Forshee
In reply to this post by Andy Whitcroft-3
On Tue, Feb 13, 2018 at 02:48:55PM +0000, Andy Whitcroft wrote:

> Around oneiric we disabled the use of libbfd in perf.  This was to avoid a
> versioned dependency and at the time at least to avoid a licensing issue.
> Since then upstream has changed the controls and this no longer works.
> Because the tools just drop back to libbfd we have continued to produce
> functional binaries.
>
> Following this email are two patches to fix this.  They add a new
> control to the upstream code.  This allows us to ensure that libbfd is
> turned off.  They additionally flip us over to a renamed control for
> the mangler name.
>
> Proposing for bionic.

Applied to bionic/master-next, thanks!

--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team