UBUNTU: [Packaging] perf: build without libtraceevent
Disable libtraceevent in perf to avoid adding extra build dependencies for now. Signed-off-by: Andrea Righi <andrea.righi@canonical.com>
This commit is contained in:
committed by
Paolo Pisati
parent
2d640faab1
commit
92550b568d
Vendored
+2
-2
@@ -759,11 +759,11 @@ ifeq ($(do_tools_perf),true)
|
|||||||
cd $(builddirpa) && $(kmake) syncconfig
|
cd $(builddirpa) && $(kmake) syncconfig
|
||||||
cd $(builddirpa) && $(kmake) prepare
|
cd $(builddirpa) && $(kmake) prepare
|
||||||
cd $(builddirpa)/tools/perf && \
|
cd $(builddirpa)/tools/perf && \
|
||||||
$(kmake) prefix=/usr HAVE_NO_LIBBFD=1 HAVE_CPLUS_DEMANGLE_SUPPORT=1 CROSS_COMPILE=$(CROSS_COMPILE) NO_LIBPYTHON=1 NO_LIBPERL=1 WERROR=0
|
$(kmake) prefix=/usr NO_LIBTRACEEVENT=1 HAVE_NO_LIBBFD=1 HAVE_CPLUS_DEMANGLE_SUPPORT=1 CROSS_COMPILE=$(CROSS_COMPILE) NO_LIBPYTHON=1 NO_LIBPERL=1 WERROR=0
|
||||||
endif
|
endif
|
||||||
ifeq ($(do_tools_bpftool),true)
|
ifeq ($(do_tools_bpftool),true)
|
||||||
mv $(builddirpa)/tools/bpf/bpftool/vmlinux $(builddirpa)/vmlinux
|
mv $(builddirpa)/tools/bpf/bpftool/vmlinux $(builddirpa)/vmlinux
|
||||||
$(kmake) CROSS_COMPILE=$(CROSS_COMPILE) -C $(builddirpa)/tools/bpf/bpftool
|
$(kmake) NO_LIBTRACEEVENT=1 CROSS_COMPILE=$(CROSS_COMPILE) -C $(builddirpa)/tools/bpf/bpftool
|
||||||
rm -f $(builddirpa)/vmlinux
|
rm -f $(builddirpa)/vmlinux
|
||||||
endif
|
endif
|
||||||
ifeq ($(do_tools_x86),true)
|
ifeq ($(do_tools_x86),true)
|
||||||
|
|||||||
Vendored
+2
-2
@@ -133,7 +133,7 @@ ifeq ($(do_tools_common),true)
|
|||||||
install -m755 debian/tools/generic $(toolsbin)/x86_energy_perf_policy
|
install -m755 debian/tools/generic $(toolsbin)/x86_energy_perf_policy
|
||||||
install -m755 debian/tools/generic $(toolsbin)/turbostat
|
install -m755 debian/tools/generic $(toolsbin)/turbostat
|
||||||
|
|
||||||
cd $(builddir)/tools/tools/perf && make man
|
cd $(builddir)/tools/tools/perf && make NO_LIBTRACEEVENT=1 man
|
||||||
install -m644 $(builddir)/tools/tools/perf/Documentation/*.1 \
|
install -m644 $(builddir)/tools/tools/perf/Documentation/*.1 \
|
||||||
$(toolsman)/man1
|
$(toolsman)/man1
|
||||||
|
|
||||||
@@ -171,7 +171,7 @@ ifeq ($(do_tools_host),true)
|
|||||||
install -m 644 $(CURDIR)/tools/kvm/kvm_stat/kvm_stat.service \
|
install -m 644 $(CURDIR)/tools/kvm/kvm_stat/kvm_stat.service \
|
||||||
$(hosttoolssystemd)/
|
$(hosttoolssystemd)/
|
||||||
|
|
||||||
cd $(builddir)/tools/tools/kvm/kvm_stat && make man
|
cd $(builddir)/tools/tools/kvm/kvm_stat && make NO_LIBTRACEEVENT=1 man
|
||||||
install -m644 $(builddir)/tools/tools/kvm/kvm_stat/*.1 \
|
install -m644 $(builddir)/tools/tools/kvm/kvm_stat/*.1 \
|
||||||
$(hosttoolsman)/man1
|
$(hosttoolsman)/man1
|
||||||
endif
|
endif
|
||||||
|
|||||||
Reference in New Issue
Block a user