[OE-core] [PATCH 1/2] glib-2.0: Fix ptest to build with uclibc.

[Richard Purdie]

On Fri, 2013-02-08 at 16:35 +0100, Björn Stenberg wrote:
> Only install eglibc-specific dependencies when building for eglibc.
> Tweak a test case that won't build with uclibc.
> 
> Signed-off-by: Björn Stenberg <bjst at enea.com>
> ---
>  .../glib-2.0/glib-2.0/fix-conflicting-rand.patch   |   35 ++++++++++++++++++++
>  meta/recipes-core/glib-2.0/glib-2.0_2.34.3.bb      |   18 ++++++----
>  2 files changed, 46 insertions(+), 7 deletions(-)
>  create mode 100644 meta/recipes-core/glib-2.0/glib-2.0/fix-conflicting-rand.patch
> 
> 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 0000000..1571112
> --- /dev/null
> +++ b/meta/recipes-core/glib-2.0/glib-2.0/fix-conflicting-rand.patch
> @@ -0,0 +1,35 @@
> +Rename 'rand' variable to avoid conflict with stdlib.h.
> +
> +Upstream-Status: pending
> +Signed-off-by: Björn Stenberg <bjst at 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");
> + }
> + 
> diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.34.3.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.34.3.bb
> index fe50220..d163030 100644
> --- a/meta/recipes-core/glib-2.0/glib-2.0_2.34.3.bb
> +++ b/meta/recipes-core/glib-2.0/glib-2.0_2.34.3.bb
> @@ -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_libc-eglibc += "\

I have a suspicion this will overwrite the base RDEPENDS_${PN}-ptest
value due to the way overrides work when in fact you want to append to
it. You probably need:

RDEPENDS_${PN}-ptest_append_libc-eglibc = "\

>              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() {