summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-kernel/perf/perf-features.inc2
-rw-r--r--meta/recipes-kernel/perf/perf.bb5
2 files changed, 5 insertions, 2 deletions
diff --git a/meta/recipes-kernel/perf/perf-features.inc b/meta/recipes-kernel/perf/perf-features.inc
index b8859ab7d5..2dbbb47761 100644
--- a/meta/recipes-kernel/perf/perf-features.inc
+++ b/meta/recipes-kernel/perf/perf-features.inc
@@ -1,4 +1,4 @@
1PERF_FEATURES_ENABLE ?= "perf-scripting perf-tui" 1PERF_FEATURES_ENABLE ?= "perf-scripting perf-tui perf-libunwind"
2 2
3def perf_feature_enabled(feature, trueval, falseval, d): 3def perf_feature_enabled(feature, trueval, falseval, d):
4 """ 4 """
diff --git a/meta/recipes-kernel/perf/perf.bb b/meta/recipes-kernel/perf/perf.bb
index ebfedb91d7..cbd03f27ba 100644
--- a/meta/recipes-kernel/perf/perf.bb
+++ b/meta/recipes-kernel/perf/perf.bb
@@ -20,6 +20,7 @@ BUILDPERF_libc-uclibc = "no"
20# to cover a wide range of kernel we add both dependencies 20# to cover a wide range of kernel we add both dependencies
21TUI_DEPENDS = "${@perf_feature_enabled('perf-tui', 'libnewt slang', '',d)}" 21TUI_DEPENDS = "${@perf_feature_enabled('perf-tui', 'libnewt slang', '',d)}"
22SCRIPTING_DEPENDS = "${@perf_feature_enabled('perf-scripting', 'perl python', '',d)}" 22SCRIPTING_DEPENDS = "${@perf_feature_enabled('perf-scripting', 'perl python', '',d)}"
23LIBUNWIND_DEPENDS = "${@perf_feature_enabled('perf-libunwind', 'libunwind', '',d)}"
23 24
24DEPENDS = "virtual/kernel \ 25DEPENDS = "virtual/kernel \
25 virtual/${MLPREFIX}libc \ 26 virtual/${MLPREFIX}libc \
@@ -27,6 +28,7 @@ DEPENDS = "virtual/kernel \
27 ${MLPREFIX}binutils \ 28 ${MLPREFIX}binutils \
28 ${TUI_DEPENDS} \ 29 ${TUI_DEPENDS} \
29 ${SCRIPTING_DEPENDS} \ 30 ${SCRIPTING_DEPENDS} \
31 ${LIBUNWIND_DEPENDS} \
30 bison flex \ 32 bison flex \
31" 33"
32 34
@@ -62,6 +64,7 @@ B = "${WORKDIR}/${BPN}-${PV}"
62 64
63SCRIPTING_DEFINES = "${@perf_feature_enabled('perf-scripting', '', 'NO_LIBPERL=1 NO_LIBPYTHON=1',d)}" 65SCRIPTING_DEFINES = "${@perf_feature_enabled('perf-scripting', '', 'NO_LIBPERL=1 NO_LIBPYTHON=1',d)}"
64TUI_DEFINES = "${@perf_feature_enabled('perf-tui', '', 'NO_NEWT=1',d)}" 66TUI_DEFINES = "${@perf_feature_enabled('perf-tui', '', 'NO_NEWT=1',d)}"
67LIBUNWIND_DEFINES = "${@perf_feature_enabled('perf-libunwind', '', 'NO_LIBUNWIND=1',d)}"
65 68
66# The LDFLAGS is required or some old kernels fails due missing 69# The LDFLAGS is required or some old kernels fails due missing
67# symbols and this is preferred than requiring patches to every old 70# symbols and this is preferred than requiring patches to every old
@@ -76,7 +79,7 @@ EXTRA_OEMAKE = '\
76 CC="${CC}" \ 79 CC="${CC}" \
77 AR="${AR}" \ 80 AR="${AR}" \
78 perfexecdir=${libexecdir} \ 81 perfexecdir=${libexecdir} \
79 NO_GTK2=1 ${TUI_DEFINES} NO_DWARF=1 NO_LIBUNWIND=1 ${SCRIPTING_DEFINES} \ 82 NO_GTK2=1 ${TUI_DEFINES} NO_DWARF=1 ${LIBUNWIND_DEFINES} ${SCRIPTING_DEFINES} \
80' 83'
81 84
82EXTRA_OEMAKE += "\ 85EXTRA_OEMAKE += "\