mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-08 17:02:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

glib-2.0: Fix ptest to build with uclibc.

Browse Source 
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>
This commit is contained in:
Björn Stenberg
2013-02-11 16:02:04 +01:00
committed by Richard Purdie
parent 21b6ff9bc3
commit f9b894eaba
2 changed files with 46 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
meta/recipes-core/glib-2.0/glib-2.0/fix-conflicting-rand.patch Normal file
View File

@@ -0,0 +1,35 @@
Rename 'rand' variable to avoid conflict.
Upstream-Status: pending
Signed-off-by: Björn Stenberg <bjst@enea.com>
diff -u glib-2.34.3/tests/refcount/signals.c~ glib-2.34.3/tests/refcount/signals.c
--- glib-2.34.3/tests/refcount/signals.c 2012-11-26 17:52:48.000000000 +0100
+++ glib-2.34.3/tests/refcount/signals.c 2013-02-08 14:24:10.052477546 +0100
@@ -9,7 +9,7 @@
#define MY_IS_TEST_CLASS(tclass) (G_TYPE_CHECK_CLASS_TYPE ((tclass), G_TYPE_TEST))
#define MY_TEST_GET_CLASS(test) (G_TYPE_INSTANCE_GET_CLASS ((test), G_TYPE_TEST, GTestClass))
-static GRand *rand;
+static GRand *grand;
typedef struct _GTest GTest;
typedef struct _GTestClass GTestClass;
@@ -84,7 +84,7 @@
NULL
};
- rand = g_rand_new();
+ grand = g_rand_new();
test_type = g_type_register_static (G_TYPE_OBJECT, "GTest",
&test_info, 0);
@@ -218,7 +218,7 @@
static void
my_test_do_prop (GTest * test)
{
- test->value = g_rand_int (rand);
+ test->value = g_rand_int (grand);
g_object_notify (G_OBJECT (test), "test-prop");
}

18
meta/recipes-core/glib-2.0/glib-2.0_2.34.3.bb
View File

@@ -13,6 +13,7 @@ SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \
file://configure-libtool.patch \
file://glib-2.0_fix_for_x32.patch \
file://obsolete_automake_macros.patch \
file://fix-conflicting-rand.patch \
file://Makefile-ptest.patch \
file://run-ptest \
"
@@ -23,6 +24,16 @@ SRC_URI_append_class-native = " file://glib-gettextize-dir.patch"
BBCLASSEXTEND = "native nativesdk"
RDEPENDS_${PN}-ptest += "\
tzdata \
tzdata-americas \
tzdata-asia \
tzdata-europe \
tzdata-posix \
python-pygobject \
python-dbus \
"
RDEPENDS_${PN}-ptest_append_libc-glibc = "\
eglibc-gconv-utf-16 \
eglibc-charmap-utf-8 \
eglibc-gconv-cp1255 \
@@ -31,13 +42,6 @@ RDEPENDS_${PN}-ptest += "\
eglibc-gconv-utf-7 \
eglibc-charmap-invariant \
eglibc-localedata-translit-cjk-variants \
tzdata \
tzdata-americas \
tzdata-asia \
tzdata-europe \
tzdata-posix \
python-pygobject \
python-dbus \
"
do_configure_prepend() {