summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2012-08-08 07:57:46 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-12-06 12:31:01 +0000
commit0333796a6b167dd754806700d7f771dd4a74e4ab (patch)
tree4cf937bfe6e1436383cd46bc2003037269cb70c1
parent74c17311635f9cf16d3ede2c0112839a26f7404d (diff)
downloadpoky-0333796a6b167dd754806700d7f771dd4a74e4ab.tar.gz
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 (From OE-Core rev: cd7aa7440103284a47b96ec176cace8685f720bb) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-kernel/oprofile/oprofile.inc4
-rw-r--r--meta/recipes-kernel/oprofile/oprofile/fix-bfd-include.patch66
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}"
19FILES_${PN}-dev += "${libdir}/${BPN}/lib*${SOLIBSDEV} ${libdir}/${BPN}/lib*.la" 19FILES_${PN}-dev += "${libdir}/${BPN}/lib*${SOLIBSDEV} ${libdir}/${BPN}/lib*.la"
20FILES_${PN}-staticdev += "${libdir}/${BPN}/lib*.a" 20FILES_${PN}-staticdev += "${libdir}/${BPN}/lib*.a"
21 21
22INC_PR = "r1" 22INC_PR = "r2"
23 23
24SRC_URI = "file://opstart.patch \ 24SRC_URI = "file://opstart.patch \
25 file://oprofile-no-query-modules.patch \ 25 file://oprofile-no-query-modules.patch \
26 file://oprofile-root.patch \ 26 file://oprofile-root.patch \
27 file://fix-bfd-include.patch \
27 file://acinclude.m4" 28 file://acinclude.m4"
28 29
29inherit autotools 30inherit autotools
30 31
31EXTRA_OECONF = "--with-kernel-support --without-x" 32EXTRA_OECONF = "--with-kernel-support --without-x"
32
33do_configure () { 33do_configure () {
34 cp ${WORKDIR}/acinclude.m4 ${S}/ 34 cp ${WORKDIR}/acinclude.m4 ${S}/
35 autotools_do_configure 35 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 @@
1bfd.h now wants to include autotools generated config.h for reasoning read
2http://sourceware.org/bugzilla/show_bug.cgi?id=14243
3
4Signed-off-by: Khem Raj <raj.khem@gmail.com>
5
6Upstream-Status: Pending
7Index: oprofile-0.9.7/libutil++/bfd_support.h
8===================================================================
9--- oprofile-0.9.7.orig/libutil++/bfd_support.h 2011-07-04 19:25:04.000000000 -0700
10+++ oprofile-0.9.7/libutil++/bfd_support.h 2012-12-02 10:51:23.518784249 -0800
11@@ -11,6 +11,7 @@
12 #ifndef BFD_SUPPORT_H
13 #define BFD_SUPPORT_H
14
15+#include "config.h"
16 #include "utility.h"
17 #include "op_types.h"
18 #include "locate_images.h"
19Index: oprofile-0.9.7/libopagent/opagent.c
20===================================================================
21--- oprofile-0.9.7.orig/libopagent/opagent.c 2011-07-04 19:25:04.000000000 -0700
22+++ oprofile-0.9.7/libopagent/opagent.c 2012-12-02 10:58:10.954804150 -0800
23@@ -50,6 +50,7 @@
24 * See libopagent/Makefile.am for more information.
25 *******************************************************************/
26
27+#include "config.h"
28 #include <stdio.h>
29 #include <errno.h>
30 #include <string.h>
31Index: oprofile-0.9.7/libpp/symbol.h
32===================================================================
33--- oprofile-0.9.7.orig/libpp/symbol.h 2011-07-04 19:25:04.000000000 -0700
34+++ oprofile-0.9.7/libpp/symbol.h 2012-12-02 10:59:59.434809273 -0800
35@@ -18,6 +18,7 @@
36 #include "format_flags.h"
37 #include "op_types.h"
38
39+#include "config.h"
40 #include <bfd.h>
41 #include <stdint.h>
42
43Index: oprofile-0.9.7/opjitconv/debug_line.c
44===================================================================
45--- oprofile-0.9.7.orig/opjitconv/debug_line.c 2011-07-04 19:25:04.000000000 -0700
46+++ oprofile-0.9.7/opjitconv/debug_line.c 2012-12-02 11:02:26.046816339 -0800
47@@ -8,6 +8,7 @@
48 * @author Philippe Elie
49 */
50
51+#include "config.h"
52 #include <stdint.h>
53 #include <stdlib.h>
54 #include <string.h>
55Index: oprofile-0.9.7/opjitconv/opjitconv.h
56===================================================================
57--- oprofile-0.9.7.orig/opjitconv/opjitconv.h 2011-07-04 19:25:04.000000000 -0700
58+++ oprofile-0.9.7/opjitconv/opjitconv.h 2012-12-02 11:01:25.558813373 -0800
59@@ -26,6 +26,7 @@
60 #define OP_JIT_CONV_ALREADY_DONE 5
61 #define OP_JIT_CONV_TMPDIR_NOT_REMOVED 6
62
63+#include "config.h"
64 #include <bfd.h>
65 #include <stddef.h>
66 #include <sys/stat.h>