Commit 96fb9ee9 authored by Andy Whitcroft's avatar Andy Whitcroft Committed by Kleber Sacilotto de Souza

UBUNTU: [Packaging] correct disablement of libbfd

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/1748922Signed-off-by: default avatarAndy Whitcroft <apw@canonical.com>
Signed-off-by: default avatarSeth Forshee <seth.forshee@canonical.com>
(cherry-picked from commit 3be4ddf4fc06e6dcfef876020b6b4228dea5cfc1 bionic)
Signed-off-by: default avatarStefan Bader <stefan.bader@canonical.com>
Acked-by: default avatarKhalid Elmously <khalid.elmously@canonical.com>
Acked-by: default avatarColin Ian King <colin.king@canonical.com>
Signed-off-by: default avatarKleber Sacilotto de Souza <kleber.souza@canonical.com>
parent ab53abce
...@@ -616,7 +616,7 @@ ifeq ($(do_tools_perf),true) ...@@ -616,7 +616,7 @@ ifeq ($(do_tools_perf),true)
cd $(builddirpa) && $(kmake) silentoldconfig cd $(builddirpa) && $(kmake) silentoldconfig
cd $(builddirpa) && $(kmake) prepare cd $(builddirpa) && $(kmake) prepare
cd $(builddirpa)/tools/perf && \ 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 endif
ifeq ($(do_tools_x86),true) ifeq ($(do_tools_x86),true)
cd $(builddirpa)/tools/power/x86/x86_energy_perf_policy && make CROSS_COMPILE=$(CROSS_COMPILE) cd $(builddirpa)/tools/power/x86/x86_energy_perf_policy && make CROSS_COMPILE=$(CROSS_COMPILE)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment