From a7e9befafa4eab7750d19872991d32974a7d9c3a Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Tue, 17 May 2011 09:17:21 +0200 Subject: [PATCH] glib-2.0: append libffi and python-argparse to DEPENDS_virtclass-native, drop gdbus-serialization test * DEPENDS_virtclass-native is defined in glib.inc so normal DEPENDS are ignored for -native builds * gdbus-serialization test causes circular dependency dbus-glib, and because we cannot add dbus to DEPENDS then we had to drop this test so apply dcf425c5472fdee74885c4f21a851e39c84e6642 from oe.dev (From meta-openembedded rev: 10d8c7ae116e231ed175e3a021e8e22d70a2141c) Signed-off-by: Martin Jansa Signed-off-by: Patrick Ohly --- meta-openembedded/meta-oe/recipes-core/glib-2.0/glib-2.0_git.bb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/meta-openembedded/meta-oe/recipes-core/glib-2.0/glib-2.0_git.bb b/meta-openembedded/meta-oe/recipes-core/glib-2.0/glib-2.0_git.bb index 51b0448..34fcaf6 100644 --- a/meta-openembedded/meta-oe/recipes-core/glib-2.0/glib-2.0_git.bb +++ b/meta-openembedded/meta-oe/recipes-core/glib-2.0/glib-2.0_git.bb @@ -6,12 +6,13 @@ PR = "r1" DEFAULT_PREFERENCE = "-1" DEPENDS += "libffi python-argparse-native" +DEPENDS_virtclass-native += "libffi-native python-argparse-native" SRC_URI = "git://git.gnome.org/glib;protocol=git;branch=master \ file://configure-libtool.patch \ file://60_wait-longer-for-threads-to-die.patch \ file://g_once_init_enter.patch \ - file://remove.test.for.qsort_r.patch \ + file://remove.test.for.qsort_r.patch \ " SRCREV = "d97cbc6731deab137770bc0fe9c69b06f689f5b4" PV = "2.29.3+gitr${SRCPV}" @@ -27,4 +28,5 @@ do_configure_prepend() { # missing ${topdir}/gtk-doc.make and --disable-gtk-doc* is not enough, because it calls gtkdocize (not provided by gtk-doc-native) sed -i '/^docs/d' ${S}/configure.ac sed -i 's/SUBDIRS = . m4macros glib gmodule gthread gobject gio tests po docs/SUBDIRS = . m4macros glib gmodule gthread gobject gio tests po/g' ${S}/Makefile.am + sed -i -e "s:TEST_PROGS += gdbus-serialization::g" ${S}/gio/tests/Makefile.am } -- 2.7.4