mirror of
git://git.yoctoproject.org/poky.git
synced 2025-07-19 21:09:03 +02:00
d38ad32718
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>
50 lines
1.9 KiB
Diff
50 lines
1.9 KiB
Diff
Index: tools/perf/Makefile
|
|
===================================================================
|
|
--- a/tools/perf/Makefile 2011-01-14 14:17:33.127008554 -0600
|
|
+++ b/tools/perf/Makefile 2011-01-14 14:18:14.227008548 -0600
|
|
@@ -588,42 +588,8 @@
|
|
endif
|
|
endif
|
|
|
|
-ifdef NO_LIBPERL
|
|
- BASIC_CFLAGS += -DNO_LIBPERL
|
|
-else
|
|
- PERL_EMBED_LDOPTS = $(shell perl -MExtUtils::Embed -e ldopts 2>/dev/null)
|
|
- PERL_EMBED_LDFLAGS = $(call strip-libs,$(PERL_EMBED_LDOPTS))
|
|
- PERL_EMBED_LIBADD = $(call grep-libs,$(PERL_EMBED_LDOPTS))
|
|
- PERL_EMBED_CCOPTS = `perl -MExtUtils::Embed -e ccopts 2>/dev/null`
|
|
- FLAGS_PERL_EMBED=$(PERL_EMBED_CCOPTS) $(PERL_EMBED_LDOPTS)
|
|
-
|
|
- ifneq ($(call try-cc,$(SOURCE_PERL_EMBED),$(FLAGS_PERL_EMBED)),y)
|
|
- BASIC_CFLAGS += -DNO_LIBPERL
|
|
- else
|
|
- ALL_LDFLAGS += $(PERL_EMBED_LDFLAGS)
|
|
- EXTLIBS += $(PERL_EMBED_LIBADD)
|
|
- LIB_OBJS += $(OUTPUT)util/scripting-engines/trace-event-perl.o
|
|
- LIB_OBJS += $(OUTPUT)scripts/perl/Perf-Trace-Util/Context.o
|
|
- endif
|
|
-endif
|
|
-
|
|
-ifdef NO_LIBPYTHON
|
|
- BASIC_CFLAGS += -DNO_LIBPYTHON
|
|
-else
|
|
- PYTHON_EMBED_LDOPTS = $(shell python-config --ldflags 2>/dev/null)
|
|
- PYTHON_EMBED_LDFLAGS = $(call strip-libs,$(PYTHON_EMBED_LDOPTS))
|
|
- PYTHON_EMBED_LIBADD = $(call grep-libs,$(PYTHON_EMBED_LDOPTS))
|
|
- PYTHON_EMBED_CCOPTS = `python-config --cflags 2>/dev/null`
|
|
- FLAGS_PYTHON_EMBED=$(PYTHON_EMBED_CCOPTS) $(PYTHON_EMBED_LDOPTS)
|
|
- ifneq ($(call try-cc,$(SOURCE_PYTHON_EMBED),$(FLAGS_PYTHON_EMBED)),y)
|
|
- BASIC_CFLAGS += -DNO_LIBPYTHON
|
|
- else
|
|
- ALL_LDFLAGS += $(PYTHON_EMBED_LDFLAGS)
|
|
- EXTLIBS += $(PYTHON_EMBED_LIBADD)
|
|
- LIB_OBJS += $(OUTPUT)util/scripting-engines/trace-event-python.o
|
|
- LIB_OBJS += $(OUTPUT)scripts/python/Perf-Trace-Util/Context.o
|
|
- endif
|
|
-endif
|
|
+BASIC_CFLAGS += -DNO_LIBPERL
|
|
+BASIC_CFLAGS += -DNO_LIBPYTHON
|
|
|
|
ifdef NO_DEMANGLE
|
|
BASIC_CFLAGS += -DNO_DEMANGLE
|