From: Richard Purdie <richard.purdie@linuxfoundation.org>
To: "Björn Stenberg" <bjst@enea.com>
Cc: openembedded-core@lists.openembedded.org
Subject: Re: [PATCH 1/2] glib-2.0: Fix ptest to build with uclibc.
Date: Fri, 08 Feb 2013 17:27:08 +0000 [thread overview]
Message-ID: <1360344428.10722.111.camel@ted> (raw)
In-Reply-To: <1360337733-51730-2-git-send-email-bjst@enea.com>
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@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@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() {
next prev parent reply other threads:[~2013-02-08 17:43 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-02-08 15:35 [PATCH 0/2] uclibc ptest changes Björn Stenberg
2013-02-08 15:35 ` [PATCH 1/2] glib-2.0: Fix ptest to build with uclibc Björn Stenberg
2013-02-08 17:27 ` Richard Purdie [this message]
2013-02-11 15:02 ` [PATCH 1/2 v2] " Björn Stenberg
2013-02-08 15:35 ` [PATCH 2/2] libiconv: Remove RPATH from binaries Björn Stenberg
2013-02-11 15:41 ` Richard Purdie
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1360344428.10722.111.camel@ted \
--to=richard.purdie@linuxfoundation.org \
--cc=bjst@enea.com \
--cc=openembedded-core@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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.