summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOtavio Salvador <otavio@ossystems.com.br>2013-09-17 04:18:20 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-09-17 19:53:56 (GMT)
commite624d737b7117f00b81b389ab81570d1737cc339 (patch)
treef42749cc8716b9fb057d22b97e1f6d8b555eb774
parent1db33e3c4dd7f50c7141f30949216457056b09dd (diff)
downloadpoky-e624d737b7117f00b81b389ab81570d1737cc339.tar.gz
perf: Ensure we use CFLAGS and LDFLAGS settings from kernel build systemyocto-1.5_M5.rc21.5_M5.rc2
The kernel build system does the right thing here and we should stop overriding it. This code has been added based on a change from 'meta-metro' layer, revision 9d698004137c1a888d40d6a4808d94afa22387e7, without any information about what problem it fixes so I am reverting it. Using the CFLAGS and LDFLAGS makes it impossible for kernel build system to append to it, thus making the build fail in various ways as: | CC /.../perf/1.0-r8/perf-1.0/perf.o | In file included from builtin.h:4:0, | from perf.c:9: | util/util.h:74:24: fatal error: lk/debugfs.h: No such file or directory | #include <lk/debugfs.h> | ^ | compilation terminated. The unset is done in do_compile and do_install otherwise it /rebuild/ perf as it detects the compiler options has change. (From OE-Core rev: 2e90f8846db0f3ed99a175befff9ec67fe12bc4e) Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-kernel/perf/perf.bb11
1 files changed, 4 insertions, 7 deletions
diff --git a/meta/recipes-kernel/perf/perf.bb b/meta/recipes-kernel/perf/perf.bb
index d2c1048..4a815ff 100644
--- a/meta/recipes-kernel/perf/perf.bb
+++ b/meta/recipes-kernel/perf/perf.bb
@@ -60,7 +60,6 @@ B = "${WORKDIR}/${BPN}-${PV}"
60SCRIPTING_DEFINES = "${@perf_feature_enabled('perf-scripting', '', 'NO_LIBPERL=1 NO_LIBPYTHON=1',d)}" 60SCRIPTING_DEFINES = "${@perf_feature_enabled('perf-scripting', '', 'NO_LIBPERL=1 NO_LIBPYTHON=1',d)}"
61TUI_DEFINES = "${@perf_feature_enabled('perf-tui', '', 'NO_NEWT=1',d)}" 61TUI_DEFINES = "${@perf_feature_enabled('perf-tui', '', 'NO_NEWT=1',d)}"
62 62
63export LDFLAGS = "-ldl -lutil"
64EXTRA_OEMAKE = \ 63EXTRA_OEMAKE = \
65 '-C ${S}/tools/perf \ 64 '-C ${S}/tools/perf \
66 O=${B} \ 65 O=${B} \
@@ -72,13 +71,7 @@ EXTRA_OEMAKE = \
72 NO_GTK2=1 ${TUI_DEFINES} NO_DWARF=1 ${SCRIPTING_DEFINES} \ 71 NO_GTK2=1 ${TUI_DEFINES} NO_DWARF=1 ${SCRIPTING_DEFINES} \
73 ' 72 '
74 73
75# We already pass the correct arguments to our compiler for the CFLAGS (if we
76# don't override it, it'll add -m32/-m64 itself). For LDFLAGS, it was failing
77# to find bfd symbols.
78EXTRA_OEMAKE += "\ 74EXTRA_OEMAKE += "\
79 'CFLAGS=${CFLAGS} -fPIC' \
80 'LDFLAGS=${LDFLAGS} -lpthread -lrt -lelf -lm -lbfd' \
81 \
82 'prefix=${prefix}' \ 75 'prefix=${prefix}' \
83 'bindir=${bindir}' \ 76 'bindir=${bindir}' \
84 'sharedir=${datadir}' \ 77 'sharedir=${datadir}' \
@@ -94,10 +87,14 @@ EXTRA_OEMAKE += "\
94PARALLEL_MAKE = "" 87PARALLEL_MAKE = ""
95 88
96do_compile() { 89do_compile() {
90 # Linux kernel build system is expected to do the right thing
91 unset CFLAGS LDFLAGS
97 oe_runmake all 92 oe_runmake all
98} 93}
99 94
100do_install() { 95do_install() {
96 # Linux kernel build system is expected to do the right thing
97 unset CFLAGS LDFLAGS
101 oe_runmake DESTDIR=${D} install 98 oe_runmake DESTDIR=${D} install
102 # we are checking for this make target to be compatible with older perf versions 99 # we are checking for this make target to be compatible with older perf versions
103 if [ "${@perf_feature_enabled('perf-scripting', 1, 0, d)}" = "1" -a $(grep install-python_ext ${S}/tools/perf/Makefile) = "0"]; then 100 if [ "${@perf_feature_enabled('perf-scripting', 1, 0, d)}" = "1" -a $(grep install-python_ext ${S}/tools/perf/Makefile) = "0"]; then