diff options
author | Matthew McClintock <msm@freescale.com> | 2012-08-16 21:54:56 -0500 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-08-19 10:45:58 +0100 |
commit | 570edd27373b9eb217d985634b01894fca6543ed (patch) | |
tree | 8fd8cbb7a38df11a9e85cca7fb2d8a852091a3d5 | |
parent | 05b343ee4b3ce410eafe5a301a10f252f542c547 (diff) | |
download | poky-570edd27373b9eb217d985634b01894fca6543ed.tar.gz |
perf_3.4.bb: update to build against older kernels
Removes a make install-python_ext when not present since
older versions of perf lack this install rule
This also fixes a library issue on older kernels building with
a newer toolchain where libaries that would previously be pulled
in are no longer. So we add them manually.
(From OE-Core rev: 70b17a893bd2e1bbba8ea16619b02a60e7c4b8d8)
Signed-off-by: Matthew McClintock <msm@freescale.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-kernel/perf/perf_3.4.bb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/meta/recipes-kernel/perf/perf_3.4.bb b/meta/recipes-kernel/perf/perf_3.4.bb index 505c7b8084..5fb38e60ed 100644 --- a/meta/recipes-kernel/perf/perf_3.4.bb +++ b/meta/recipes-kernel/perf/perf_3.4.bb | |||
@@ -54,6 +54,7 @@ B = "${WORKDIR}/${BPN}-${PV}" | |||
54 | SCRIPTING_DEFINES = "${@perf_feature_enabled('perf-scripting', '', 'NO_LIBPERL=1 NO_LIBPYTHON=1',d)}" | 54 | SCRIPTING_DEFINES = "${@perf_feature_enabled('perf-scripting', '', 'NO_LIBPERL=1 NO_LIBPYTHON=1',d)}" |
55 | TUI_DEFINES = "${@perf_feature_enabled('perf-tui', '', 'NO_NEWT=1',d)}" | 55 | TUI_DEFINES = "${@perf_feature_enabled('perf-tui', '', 'NO_NEWT=1',d)}" |
56 | 56 | ||
57 | export LDFLAGS = "-ldl -lutil" | ||
57 | EXTRA_OEMAKE = \ | 58 | EXTRA_OEMAKE = \ |
58 | '-C ${S}/tools/perf \ | 59 | '-C ${S}/tools/perf \ |
59 | O=${B} \ | 60 | O=${B} \ |
@@ -71,7 +72,8 @@ do_compile() { | |||
71 | 72 | ||
72 | do_install() { | 73 | do_install() { |
73 | oe_runmake DESTDIR=${D} install | 74 | oe_runmake DESTDIR=${D} install |
74 | if [ "${@perf_feature_enabled('perf-scripting', 1, 0, d)}" = "1" ]; then | 75 | # we are checking for this make target to be compatible with older perf versions |
76 | if [ "${@perf_feature_enabled('perf-scripting', 1, 0, d)}" = "1" -a $(grep install-python_ext ${S}/tools/perf/Makefile) = "0"]; then | ||
75 | oe_runmake DESTDIR=${D} install-python_ext | 77 | oe_runmake DESTDIR=${D} install-python_ext |
76 | fi | 78 | fi |
77 | } | 79 | } |