From: Ting Liu Date: Wed, 23 Jul 2014 03:58:56 +0000 (+0800) Subject: perf: remove CFLAGS override X-Git-Tag: 2015-4~2202 X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=7e7063e495d6451b46e06d08d16f92d0597a7d11;p=openembedded-core.git perf: remove CFLAGS override definition of __SANE_USERSPACE_TYPES__ was added in kernel source by commit e3541ec75219819d3235f80125a1a75d798ff6e1 perf tools, powerpc: Fix compile warnings in tests/attr.c Overriding the CFLAGS makes it impossible for kernel build system to append to it, thus making the build fail in various ways as: | CC /.../perf/1.0-r9/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 | ^ | compilation terminated. Signed-off-by: Ting Liu Signed-off-by: Richard Purdie --- diff --git a/meta/recipes-kernel/perf/perf.bb b/meta/recipes-kernel/perf/perf.bb index 20968f98cc..222ae83c37 100644 --- a/meta/recipes-kernel/perf/perf.bb +++ b/meta/recipes-kernel/perf/perf.bb @@ -92,13 +92,6 @@ EXTRA_OEMAKE += "\ 'infodir=${@os.path.relpath(infodir, prefix)}' \ " -# PPC64 uses long long for u64 in the kernel, but powerpc's asm/types.h -# prevents 64-bit userland from seeing this definition, instead defaulting -# to u64 == long in userspace. Define __SANE_USERSPACE_TYPES__ to get -# int-ll64.h included. And MIPS64 has the same issue. -EXTRA_OEMAKE_append_powerpc64 = ' CFLAGS=-D__SANE_USERSPACE_TYPES__' -EXTRA_OEMAKE_append_mips64 = ' CFLAGS=-D__SANE_USERSPACE_TYPES__' - PARALLEL_MAKE = "" do_compile() {