Patchwork [v2] dbus-glib: fix compile error when enable-tests

login
register
mail settings
Submitter Yao Zhao
Date July 17, 2012, 7:04 p.m.
Message ID <1342551849-18372-1-git-send-email-yao.zhao@windriver.com>
Download mbox | patch
Permalink /patch/32309/
State New
Headers show

Comments

Yao Zhao - July 17, 2012, 7:04 p.m.
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]

Signed-off-by: Yao Zhao <yao.zhao@windriver.com>
---
 .../test-service-glib-include-glib-only.patch      |   13 +++++++++++++
 meta/recipes-core/dbus/dbus-glib.inc               |    4 +++-
 2 files changed, 16 insertions(+), 1 deletion(-)
 create mode 100644 meta/recipes-core/dbus/dbus-glib-0.98/test-service-glib-include-glib-only.patch
Saul Wold - July 17, 2012, 7:09 p.m.
On 07/17/2012 12:04 PM, Yao Zhao wrote:
> test-service-glib-include-glib-only.patch: fixes the compiling failure
> that test-service-glib.c includes glib/gquark.h not glib.h directly.
>

I hope that you will re-submit the unit test packaging also, that will 
be good to have.


> [YOCTO #2762]
>
> Signed-off-by: Yao Zhao <yao.zhao@windriver.com>
> ---
>   .../test-service-glib-include-glib-only.patch      |   13 +++++++++++++
>   meta/recipes-core/dbus/dbus-glib.inc               |    4 +++-
>   2 files changed, 16 insertions(+), 1 deletion(-)
>   create mode 100644 meta/recipes-core/dbus/dbus-glib-0.98/test-service-glib-include-glib-only.patch
>
> 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 0000000..e0bc0c6
> --- /dev/null
> +++ b/meta/recipes-core/dbus/dbus-glib-0.98/test-service-glib-include-glib-only.patch
> @@ -0,0 +1,13 @@

This is missing a patch header, Upstream-Status and Signed-off-by:

Sau!

> +diff --git a/test/core/test-service-glib.c b/test/core/test-service-glib.c
> +index 3355890..7291f35 100644
> +--- a/test/core/test-service-glib.c
> ++++ b/test/core/test-service-glib.c
> +@@ -11,7 +11,7 @@
> + #include <string.h>
> + #include <glib/gi18n.h>
> + #include <glib-object.h>
> +-#include <glib/gquark.h>
> ++#include <glib.h>
> +
> + #include "my-object.h"
> + #include "my-object-subclass.h"
> diff --git a/meta/recipes-core/dbus/dbus-glib.inc b/meta/recipes-core/dbus/dbus-glib.inc
> index da2845a..f554ce8 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"
>   DEPENDS_virtclass-native = "glib-2.0-native dbus-native"
>
>   SRC_URI = "http://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-${PV}.tar.gz \
> -           file://no-examples.patch"
> +           file://no-examples.patch \
> +           file://test-service-glib-include-glib-only.patch \
> +"
>
>   inherit autotools pkgconfig gettext
>
>
Yao Zhao - July 17, 2012, 7:26 p.m.
On 12-07-17 03:09 PM, Saul Wold wrote:
> On 07/17/2012 12:04 PM, Yao Zhao wrote:
>> test-service-glib-include-glib-only.patch: fixes the compiling failure
>> that test-service-glib.c includes glib/gquark.h not glib.h directly.
>>
>
> I hope that you will re-submit the unit test packaging also, that will 
> be good to have.
>
Yes, I will and I am testing just in case I made mistakes.
>
>> [YOCTO #2762]
>>
>> Signed-off-by: Yao Zhao <yao.zhao@windriver.com>
>> ---
>>   .../test-service-glib-include-glib-only.patch      |   13 
>> +++++++++++++
>>   meta/recipes-core/dbus/dbus-glib.inc               |    4 +++-
>>   2 files changed, 16 insertions(+), 1 deletion(-)
>>   create mode 100644 
>> meta/recipes-core/dbus/dbus-glib-0.98/test-service-glib-include-glib-only.patch
>>
>> 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 0000000..e0bc0c6
>> --- /dev/null
>> +++ 
>> b/meta/recipes-core/dbus/dbus-glib-0.98/test-service-glib-include-glib-only.patch
>> @@ -0,0 +1,13 @@
>
> This is missing a patch header, Upstream-Status and Signed-off-by:
>
will do!

yao
> Sau!
>
>> +diff --git a/test/core/test-service-glib.c 
>> b/test/core/test-service-glib.c
>> +index 3355890..7291f35 100644
>> +--- a/test/core/test-service-glib.c
>> ++++ b/test/core/test-service-glib.c
>> +@@ -11,7 +11,7 @@
>> + #include <string.h>
>> + #include <glib/gi18n.h>
>> + #include <glib-object.h>
>> +-#include <glib/gquark.h>
>> ++#include <glib.h>
>> +
>> + #include "my-object.h"
>> + #include "my-object-subclass.h"
>> diff --git a/meta/recipes-core/dbus/dbus-glib.inc 
>> b/meta/recipes-core/dbus/dbus-glib.inc
>> index da2845a..f554ce8 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"
>>   DEPENDS_virtclass-native = "glib-2.0-native dbus-native"
>>
>>   SRC_URI = 
>> "http://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-${PV}.tar.gz \
>> -           file://no-examples.patch"
>> +           file://no-examples.patch \
>> +           file://test-service-glib-include-glib-only.patch \
>> +"
>>
>>   inherit autotools pkgconfig gettext
>>
>>
>

Patch

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 0000000..e0bc0c6
--- /dev/null
+++ b/meta/recipes-core/dbus/dbus-glib-0.98/test-service-glib-include-glib-only.patch
@@ -0,0 +1,13 @@ 
+diff --git a/test/core/test-service-glib.c b/test/core/test-service-glib.c
+index 3355890..7291f35 100644
+--- a/test/core/test-service-glib.c
++++ b/test/core/test-service-glib.c
+@@ -11,7 +11,7 @@
+ #include <string.h>
+ #include <glib/gi18n.h>
+ #include <glib-object.h>
+-#include <glib/gquark.h>
++#include <glib.h>
+ 
+ #include "my-object.h"
+ #include "my-object-subclass.h"
diff --git a/meta/recipes-core/dbus/dbus-glib.inc b/meta/recipes-core/dbus/dbus-glib.inc
index da2845a..f554ce8 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"
 DEPENDS_virtclass-native = "glib-2.0-native dbus-native"
 
 SRC_URI = "http://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-${PV}.tar.gz \
-           file://no-examples.patch"
+           file://no-examples.patch \
+           file://test-service-glib-include-glib-only.patch \
+"
 
 inherit autotools pkgconfig gettext