diff options
| author | Tom Zanussi <tom.zanussi@intel.com> | 2011-01-14 16:33:05 -0600 |
|---|---|---|
| committer | Saul Wold <sgw@linux.intel.com> | 2011-01-14 15:18:10 -0800 |
| commit | d38ad3271829b2d282c973e69edd265ef52174c8 (patch) | |
| tree | 845ec061bf400088ae6e8cbc97bbce480a245779 /meta/recipes-kernel/linux/linux-yocto | |
| parent | 9c6b313acb500095fa80a8c57e27a55d3c34797f (diff) | |
| download | poky-d38ad3271829b2d282c973e69edd265ef52174c8.tar.gz | |
linux-yocto: hard-code NO_LIBPERL/NO_LIBPYTHON
ExtUtils::Embed ccopts is getting the host's -I/usr/local/include and
using it to compile perf, which results in a compilation error that
started appearing just recently.
This turns the code that makes use of ExtUtils::Embed off and simply
hard-codes NO_LIBPERL.
It does the same for LIBPYTHON while we're at it, since it probably
suffers from a similar underlying problem and just by chance hasn't
broken anything yet.
This will be re-enabled after I familiarize myself with the perf
recipe and am able to create a proper fix.
Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
Diffstat (limited to 'meta/recipes-kernel/linux/linux-yocto')
| -rw-r--r-- | meta/recipes-kernel/linux/linux-yocto/tools-perf-no-scripting.patch | 49 |
1 files changed, 49 insertions, 0 deletions
diff --git a/meta/recipes-kernel/linux/linux-yocto/tools-perf-no-scripting.patch b/meta/recipes-kernel/linux/linux-yocto/tools-perf-no-scripting.patch new file mode 100644 index 0000000000..e0ad9997f7 --- /dev/null +++ b/meta/recipes-kernel/linux/linux-yocto/tools-perf-no-scripting.patch | |||
| @@ -0,0 +1,49 @@ | |||
| 1 | Index: tools/perf/Makefile | ||
| 2 | =================================================================== | ||
| 3 | --- a/tools/perf/Makefile 2011-01-14 14:17:33.127008554 -0600 | ||
| 4 | +++ b/tools/perf/Makefile 2011-01-14 14:18:14.227008548 -0600 | ||
| 5 | @@ -588,42 +588,8 @@ | ||
| 6 | endif | ||
| 7 | endif | ||
| 8 | |||
| 9 | -ifdef NO_LIBPERL | ||
| 10 | - BASIC_CFLAGS += -DNO_LIBPERL | ||
| 11 | -else | ||
| 12 | - PERL_EMBED_LDOPTS = $(shell perl -MExtUtils::Embed -e ldopts 2>/dev/null) | ||
| 13 | - PERL_EMBED_LDFLAGS = $(call strip-libs,$(PERL_EMBED_LDOPTS)) | ||
| 14 | - PERL_EMBED_LIBADD = $(call grep-libs,$(PERL_EMBED_LDOPTS)) | ||
| 15 | - PERL_EMBED_CCOPTS = `perl -MExtUtils::Embed -e ccopts 2>/dev/null` | ||
| 16 | - FLAGS_PERL_EMBED=$(PERL_EMBED_CCOPTS) $(PERL_EMBED_LDOPTS) | ||
| 17 | - | ||
| 18 | - ifneq ($(call try-cc,$(SOURCE_PERL_EMBED),$(FLAGS_PERL_EMBED)),y) | ||
| 19 | - BASIC_CFLAGS += -DNO_LIBPERL | ||
| 20 | - else | ||
| 21 | - ALL_LDFLAGS += $(PERL_EMBED_LDFLAGS) | ||
| 22 | - EXTLIBS += $(PERL_EMBED_LIBADD) | ||
| 23 | - LIB_OBJS += $(OUTPUT)util/scripting-engines/trace-event-perl.o | ||
| 24 | - LIB_OBJS += $(OUTPUT)scripts/perl/Perf-Trace-Util/Context.o | ||
| 25 | - endif | ||
| 26 | -endif | ||
| 27 | - | ||
| 28 | -ifdef NO_LIBPYTHON | ||
| 29 | - BASIC_CFLAGS += -DNO_LIBPYTHON | ||
| 30 | -else | ||
| 31 | - PYTHON_EMBED_LDOPTS = $(shell python-config --ldflags 2>/dev/null) | ||
| 32 | - PYTHON_EMBED_LDFLAGS = $(call strip-libs,$(PYTHON_EMBED_LDOPTS)) | ||
| 33 | - PYTHON_EMBED_LIBADD = $(call grep-libs,$(PYTHON_EMBED_LDOPTS)) | ||
| 34 | - PYTHON_EMBED_CCOPTS = `python-config --cflags 2>/dev/null` | ||
| 35 | - FLAGS_PYTHON_EMBED=$(PYTHON_EMBED_CCOPTS) $(PYTHON_EMBED_LDOPTS) | ||
| 36 | - ifneq ($(call try-cc,$(SOURCE_PYTHON_EMBED),$(FLAGS_PYTHON_EMBED)),y) | ||
| 37 | - BASIC_CFLAGS += -DNO_LIBPYTHON | ||
| 38 | - else | ||
| 39 | - ALL_LDFLAGS += $(PYTHON_EMBED_LDFLAGS) | ||
| 40 | - EXTLIBS += $(PYTHON_EMBED_LIBADD) | ||
| 41 | - LIB_OBJS += $(OUTPUT)util/scripting-engines/trace-event-python.o | ||
| 42 | - LIB_OBJS += $(OUTPUT)scripts/python/Perf-Trace-Util/Context.o | ||
| 43 | - endif | ||
| 44 | -endif | ||
| 45 | +BASIC_CFLAGS += -DNO_LIBPERL | ||
| 46 | +BASIC_CFLAGS += -DNO_LIBPYTHON | ||
| 47 | |||
| 48 | ifdef NO_DEMANGLE | ||
| 49 | BASIC_CFLAGS += -DNO_DEMANGLE | ||