diff options
| author | Khem Raj <raj.khem@gmail.com> | 2012-08-08 07:57:46 -0700 |
|---|---|---|
| committer | Saul Wold <sgw@linux.intel.com> | 2012-12-05 23:42:33 -0800 |
| commit | cd7aa7440103284a47b96ec176cace8685f720bb (patch) | |
| tree | cf44e7592171db8b64916d3992e79f7bfc74fff9 /meta/recipes-kernel/oprofile | |
| parent | df9b304f7a43c798223606eb5f0e13f7250393fe (diff) | |
| download | openembedded-core-cd7aa7440103284a47b96ec176cace8685f720bb.tar.gz openembedded-core-cd7aa7440103284a47b96ec176cace8685f720bb.tar.bz2 openembedded-core-cd7aa7440103284a47b96ec176cace8685f720bb.zip | |
oprofile: Include config.h before bfd.h
oprofile uses bfd.h from binutils which now in 2.23+ expects config.h
so lets include it
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta/recipes-kernel/oprofile')
| -rw-r--r-- | meta/recipes-kernel/oprofile/oprofile.inc | 4 | ||||
| -rw-r--r-- | meta/recipes-kernel/oprofile/oprofile/fix-bfd-include.patch | 66 |
2 files changed, 68 insertions, 2 deletions
diff --git a/meta/recipes-kernel/oprofile/oprofile.inc b/meta/recipes-kernel/oprofile/oprofile.inc index ac8ce10440..b3ce852bba 100644 --- a/meta/recipes-kernel/oprofile/oprofile.inc +++ b/meta/recipes-kernel/oprofile/oprofile.inc @@ -19,17 +19,17 @@ FILES_${PN} = "${bindir} ${libdir}/${BPN}/lib*${SOLIBS} ${datadir}/${BPN}" FILES_${PN}-dev += "${libdir}/${BPN}/lib*${SOLIBSDEV} ${libdir}/${BPN}/lib*.la" FILES_${PN}-staticdev += "${libdir}/${BPN}/lib*.a" -INC_PR = "r1" +INC_PR = "r2" SRC_URI = "file://opstart.patch \ file://oprofile-no-query-modules.patch \ file://oprofile-root.patch \ + file://fix-bfd-include.patch \ file://acinclude.m4" inherit autotools EXTRA_OECONF = "--with-kernel-support --without-x" - do_configure () { cp ${WORKDIR}/acinclude.m4 ${S}/ autotools_do_configure diff --git a/meta/recipes-kernel/oprofile/oprofile/fix-bfd-include.patch b/meta/recipes-kernel/oprofile/oprofile/fix-bfd-include.patch new file mode 100644 index 0000000000..944320f896 --- /dev/null +++ b/meta/recipes-kernel/oprofile/oprofile/fix-bfd-include.patch @@ -0,0 +1,66 @@ +bfd.h now wants to include autotools generated config.h for reasoning read +http://sourceware.org/bugzilla/show_bug.cgi?id=14243 + +Signed-off-by: Khem Raj <raj.khem@gmail.com> + +Upstream-Status: Pending +Index: oprofile-0.9.7/libutil++/bfd_support.h +=================================================================== +--- oprofile-0.9.7.orig/libutil++/bfd_support.h 2011-07-04 19:25:04.000000000 -0700 ++++ oprofile-0.9.7/libutil++/bfd_support.h 2012-12-02 10:51:23.518784249 -0800 +@@ -11,6 +11,7 @@ + #ifndef BFD_SUPPORT_H + #define BFD_SUPPORT_H + ++#include "config.h" + #include "utility.h" + #include "op_types.h" + #include "locate_images.h" +Index: oprofile-0.9.7/libopagent/opagent.c +=================================================================== +--- oprofile-0.9.7.orig/libopagent/opagent.c 2011-07-04 19:25:04.000000000 -0700 ++++ oprofile-0.9.7/libopagent/opagent.c 2012-12-02 10:58:10.954804150 -0800 +@@ -50,6 +50,7 @@ + * See libopagent/Makefile.am for more information. + *******************************************************************/ + ++#include "config.h" + #include <stdio.h> + #include <errno.h> + #include <string.h> +Index: oprofile-0.9.7/libpp/symbol.h +=================================================================== +--- oprofile-0.9.7.orig/libpp/symbol.h 2011-07-04 19:25:04.000000000 -0700 ++++ oprofile-0.9.7/libpp/symbol.h 2012-12-02 10:59:59.434809273 -0800 +@@ -18,6 +18,7 @@ + #include "format_flags.h" + #include "op_types.h" + ++#include "config.h" + #include <bfd.h> + #include <stdint.h> + +Index: oprofile-0.9.7/opjitconv/debug_line.c +=================================================================== +--- oprofile-0.9.7.orig/opjitconv/debug_line.c 2011-07-04 19:25:04.000000000 -0700 ++++ oprofile-0.9.7/opjitconv/debug_line.c 2012-12-02 11:02:26.046816339 -0800 +@@ -8,6 +8,7 @@ + * @author Philippe Elie + */ + ++#include "config.h" + #include <stdint.h> + #include <stdlib.h> + #include <string.h> +Index: oprofile-0.9.7/opjitconv/opjitconv.h +=================================================================== +--- oprofile-0.9.7.orig/opjitconv/opjitconv.h 2011-07-04 19:25:04.000000000 -0700 ++++ oprofile-0.9.7/opjitconv/opjitconv.h 2012-12-02 11:01:25.558813373 -0800 +@@ -26,6 +26,7 @@ + #define OP_JIT_CONV_ALREADY_DONE 5 + #define OP_JIT_CONV_TMPDIR_NOT_REMOVED 6 + ++#include "config.h" + #include <bfd.h> + #include <stddef.h> + #include <sys/stat.h> |