summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core
diff options
context:
space:
mode:
authorYao Zhao <yao.zhao@windriver.com>2012-07-17 16:10:05 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-07-19 17:18:11 +0100
commitdf64377dd5fd8b2c336a9aa8c423184ed034148e (patch)
tree8b56ca55553518e9afb99f47df87d0a720464c76 /meta/recipes-core
parent4f2da78be65eba3760142144ad7ba6abef8408f4 (diff)
downloadpoky-df64377dd5fd8b2c336a9aa8c423184ed034148e.tar.gz
dbus-glib: fix compile error when enable-tests
test-service-glib-include-glib-only.patch: fixes the compiling failure that test-service-glib.c includes glib/gquark.h not glib.h directly. [YOCTO #2762] (From OE-Core rev: aefa55f3553f00753d1eb95905086bc12bc5bfaa) Signed-off-by: Yao Zhao <yao.zhao@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
-rw-r--r--meta/recipes-core/dbus/dbus-glib-0.98/test-service-glib-include-glib-only.patch20
-rw-r--r--meta/recipes-core/dbus/dbus-glib.inc4
2 files changed, 23 insertions, 1 deletions
diff --git a/meta/recipes-core/dbus/dbus-glib-0.98/test-service-glib-include-glib-only.patch b/meta/recipes-core/dbus/dbus-glib-0.98/test-service-glib-include-glib-only.patch
new file mode 100644
index 0000000000..27780e71da
--- /dev/null
+++ b/meta/recipes-core/dbus/dbus-glib-0.98/test-service-glib-include-glib-only.patch
@@ -0,0 +1,20 @@
1Fix the compiling error that not include glib.h directly.
2
3upstream bugzilla link: https://bugs.freedesktop.org/show_bug.cgi?id=52210
4Upstream-Status: Submitted
5
6Signed-off-by: Yao Zhao <yao.zhao@windriver.com>
7
8diff --git a/test/core/test-service-glib.c b/test/core/test-service-glib.c
9index 3355890..7291f35 100644
10--- a/test/core/test-service-glib.c
11+++ b/test/core/test-service-glib.c
12@@ -11,7 +11,7 @@
13 #include <string.h>
14 #include <glib/gi18n.h>
15 #include <glib-object.h>
16-#include <glib/gquark.h>
17+#include <glib.h>
18
19 #include "my-object.h"
20 #include "my-object-subclass.h"
diff --git a/meta/recipes-core/dbus/dbus-glib.inc b/meta/recipes-core/dbus/dbus-glib.inc
index da2845af02..f554ce82b1 100644
--- a/meta/recipes-core/dbus/dbus-glib.inc
+++ b/meta/recipes-core/dbus/dbus-glib.inc
@@ -11,7 +11,9 @@ DEPENDS = "expat glib-2.0 virtual/libintl dbus-glib-native dbus"
11DEPENDS_virtclass-native = "glib-2.0-native dbus-native" 11DEPENDS_virtclass-native = "glib-2.0-native dbus-native"
12 12
13SRC_URI = "http://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-${PV}.tar.gz \ 13SRC_URI = "http://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-${PV}.tar.gz \
14 file://no-examples.patch" 14 file://no-examples.patch \
15 file://test-service-glib-include-glib-only.patch \
16"
15 17
16inherit autotools pkgconfig gettext 18inherit autotools pkgconfig gettext
17 19