aboutsummaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/glib-2.0/glib-2.0_2.34.3.bb
diff options
context:
space:
mode:
authorBjörn Stenberg <bjst@enea.com>2013-02-11 16:02:04 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-02-11 15:38:56 +0000
commite28e04e26893416d577ee54e03019c03865e1bf6 (patch)
treedb4838b9a9f30421a4cbed109ce83ca127cc0903 /meta/recipes-core/glib-2.0/glib-2.0_2.34.3.bb
parent76e0bd7f8e3a3bd052a6e329f88e2d8099e899c4 (diff)
downloadopenembedded-core-contrib-e28e04e26893416d577ee54e03019c03865e1bf6.tar.gz
openembedded-core-contrib-e28e04e26893416d577ee54e03019c03865e1bf6.tar.bz2
openembedded-core-contrib-e28e04e26893416d577ee54e03019c03865e1bf6.zip
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. 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_2.34.3.bb')
-rw-r--r--meta/recipes-core/glib-2.0/glib-2.0_2.34.3.bb18
1 files changed, 11 insertions, 7 deletions
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 fe50220ea44..d58d4896c3c 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_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() {