diff options
author | Björn Stenberg <bjst@enea.com> | 2013-02-11 16:02:04 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-02-11 15:41:20 +0000 |
commit | f9b894eaba94763a8ec790f8635f58b4e7e05381 (patch) | |
tree | 84df2fb2addc8ced505dbfff8e35f17e6f813aaf /meta/recipes-core/glib-2.0/glib-2.0 | |
parent | 21b6ff9bc36f5706456b3ed3ca7b6455f77a5eaa (diff) | |
download | poky-f9b894eaba94763a8ec790f8635f58b4e7e05381.tar.gz |
glib-2.0: Fix ptest to build with uclibc.
Only install eglibc-specific dependencies when building for eglibc.
Tweak a test case that won't build with uclibc.
(From OE-Core rev: e28e04e26893416d577ee54e03019c03865e1bf6)
Signed-off-by: Björn Stenberg <bjst@enea.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/glib-2.0/glib-2.0')
-rw-r--r-- | meta/recipes-core/glib-2.0/glib-2.0/fix-conflicting-rand.patch | 35 |
1 files changed, 35 insertions, 0 deletions
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/fix-conflicting-rand.patch b/meta/recipes-core/glib-2.0/glib-2.0/fix-conflicting-rand.patch new file mode 100644 index 0000000000..1571112b0e --- /dev/null +++ b/meta/recipes-core/glib-2.0/glib-2.0/fix-conflicting-rand.patch | |||
@@ -0,0 +1,35 @@ | |||
1 | Rename 'rand' variable to avoid conflict. | ||
2 | |||
3 | Upstream-Status: pending | ||
4 | Signed-off-by: Björn Stenberg <bjst@enea.com> | ||
5 | |||
6 | diff -u glib-2.34.3/tests/refcount/signals.c~ glib-2.34.3/tests/refcount/signals.c | ||
7 | --- glib-2.34.3/tests/refcount/signals.c 2012-11-26 17:52:48.000000000 +0100 | ||
8 | +++ glib-2.34.3/tests/refcount/signals.c 2013-02-08 14:24:10.052477546 +0100 | ||
9 | @@ -9,7 +9,7 @@ | ||
10 | #define MY_IS_TEST_CLASS(tclass) (G_TYPE_CHECK_CLASS_TYPE ((tclass), G_TYPE_TEST)) | ||
11 | #define MY_TEST_GET_CLASS(test) (G_TYPE_INSTANCE_GET_CLASS ((test), G_TYPE_TEST, GTestClass)) | ||
12 | |||
13 | -static GRand *rand; | ||
14 | +static GRand *grand; | ||
15 | |||
16 | typedef struct _GTest GTest; | ||
17 | typedef struct _GTestClass GTestClass; | ||
18 | @@ -84,7 +84,7 @@ | ||
19 | NULL | ||
20 | }; | ||
21 | |||
22 | - rand = g_rand_new(); | ||
23 | + grand = g_rand_new(); | ||
24 | |||
25 | test_type = g_type_register_static (G_TYPE_OBJECT, "GTest", | ||
26 | &test_info, 0); | ||
27 | @@ -218,7 +218,7 @@ | ||
28 | static void | ||
29 | my_test_do_prop (GTest * test) | ||
30 | { | ||
31 | - test->value = g_rand_int (rand); | ||
32 | + test->value = g_rand_int (grand); | ||
33 | g_object_notify (G_OBJECT (test), "test-prop"); | ||
34 | } | ||
35 | |||