From: Matthew McClintock <msm@freescale.com>
Date: Fri, 17 Aug 2012 02:54:56 +0000 (-0500)
Subject: perf_3.4.bb: update to build against older kernels
X-Git-Tag: yocto-4.0~35861
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=70b17a893bd2e1bbba8ea16619b02a60e7c4b8d8;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

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.

Signed-off-by: Matthew McClintock <msm@freescale.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---

diff --git a/meta/recipes-kernel/perf/perf_3.4.bb b/meta/recipes-kernel/perf/perf_3.4.bb
index 505c7b80844..5fb38e60ed7 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}"
 SCRIPTING_DEFINES = "${@perf_feature_enabled('perf-scripting', '', 'NO_LIBPERL=1 NO_LIBPYTHON=1',d)}"
 TUI_DEFINES = "${@perf_feature_enabled('perf-tui', '', 'NO_NEWT=1',d)}"
 
+export LDFLAGS = "-ldl -lutil"
 EXTRA_OEMAKE = \
 		'-C ${S}/tools/perf \
 		O=${B} \
@@ -71,7 +72,8 @@ do_compile() {
 
 do_install() {
 	oe_runmake DESTDIR=${D} install
-	if [ "${@perf_feature_enabled('perf-scripting', 1, 0, d)}" = "1" ]; then
+	# we are checking for this make target to be compatible with older perf versions
+	if [ "${@perf_feature_enabled('perf-scripting', 1, 0, d)}" = "1" -a $(grep install-python_ext ${S}/tools/perf/Makefile) = "0"]; then
 		oe_runmake DESTDIR=${D} install-python_ext
 	fi
 }