From 7a4961e3fc8c0b07d6c74808b597db7bd97bf4f0 Mon Sep 17 00:00:00 2001 From: Luca Boccassi Date: Fri, 18 Jan 2019 20:01:17 +0000 Subject: [PATCH] linux-perf: explicitly disable the jvmti feature and shared library. --- debian/changelog | 1 + debian/rules.d/tools/perf/Makefile | 3 +++ 2 files changed, 4 insertions(+) diff --git a/debian/changelog b/debian/changelog index d1a140c3c..6d2215edb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ linux (4.19.16-2) UNRELEASED; urgency=medium * Do not generate linux-source-$ver stanza in debian/control if source is set to disabled in debian/config/defines. + * linux-perf: explicitly disable the jvmti feature and shared library. -- Luca Boccassi Fri, 18 Jan 2019 19:09:06 +0000 diff --git a/debian/rules.d/tools/perf/Makefile b/debian/rules.d/tools/perf/Makefile index 35de916c8..df6fa9835 100644 --- a/debian/rules.d/tools/perf/Makefile +++ b/debian/rules.d/tools/perf/Makefile @@ -21,6 +21,9 @@ MAKE_PERF := $(MAKE) O=$(CURDIR) prefix=/usr V=1 VF=1 ARCH=$(KERNEL_ARCH) WERROR # Disable Gtk UI until it's more usable MAKE_PERF += NO_GTK2=1 +# Do not build the unversioned jvmti library +MAKE_PERF += feature-jvmti=0 + # Include version in all directory names MAKE_PERF += perfexecdir=lib/perf_$(VERSION)-core plugindir=/usr/lib/traceevent_$(VERSION)/plugins STRACE_GROUPS_DIR=share/perf_$(VERSION)-core/strace/groups tipdir=share/doc/linux-perf-$(VERSION) perf_include_dir=include/perf_$(VERSION) perf_examples_dir=share/doc/linux-perf-$(VERSION)/examples