* [PATCH v2] dbus-glib: fix compile error when enable-tests
@ 2012-07-17 19:04 Yao Zhao
2012-07-17 19:09 ` Saul Wold
0 siblings, 1 reply; 3+ messages in thread
From: Yao Zhao @ 2012-07-17 19:04 UTC (permalink / raw)
To: openembedded-core
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
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
--
1.7.9.5
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH v2] dbus-glib: fix compile error when enable-tests
2012-07-17 19:04 [PATCH v2] dbus-glib: fix compile error when enable-tests Yao Zhao
@ 2012-07-17 19:09 ` Saul Wold
2012-07-17 19:26 ` Yao Zhao
0 siblings, 1 reply; 3+ messages in thread
From: Saul Wold @ 2012-07-17 19:09 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
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
>
>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH v2] dbus-glib: fix compile error when enable-tests
2012-07-17 19:09 ` Saul Wold
@ 2012-07-17 19:26 ` Yao Zhao
0 siblings, 0 replies; 3+ messages in thread
From: Yao Zhao @ 2012-07-17 19:26 UTC (permalink / raw)
To: Saul Wold; +Cc: Patches and discussions about the oe-core layer
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
>>
>>
>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2012-07-17 23:26 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-07-17 19:04 [PATCH v2] dbus-glib: fix compile error when enable-tests Yao Zhao
2012-07-17 19:09 ` Saul Wold
2012-07-17 19:26 ` Yao Zhao
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.