summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2011-05-17 09:17:21 +0200
committerMartin Jansa <Martin.Jansa@gmail.com>2011-05-19 00:02:52 +0200
commit10d8c7ae116e231ed175e3a021e8e22d70a2141c (patch)
tree02a89ec4cdbecdf010b5e1431e5b26d9ebd3b545
parent9cb1277b5ed2bd227fc05bbfc27e27b2cb7f3756 (diff)
downloadmeta-openembedded-10d8c7ae116e231ed175e3a021e8e22d70a2141c.tar.gz
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 Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-rw-r--r--meta-oe/recipes-core/glib-2.0/glib-2.0_git.bb4
1 files changed, 3 insertions, 1 deletions
diff --git a/meta-oe/recipes-core/glib-2.0/glib-2.0_git.bb b/meta-oe/recipes-core/glib-2.0/glib-2.0_git.bb
index 51b04486c..34fcaf6e7 100644
--- a/meta-oe/recipes-core/glib-2.0/glib-2.0_git.bb
+++ b/meta-oe/recipes-core/glib-2.0/glib-2.0_git.bb
@@ -6,12 +6,13 @@ PR = "r1"
6DEFAULT_PREFERENCE = "-1" 6DEFAULT_PREFERENCE = "-1"
7 7
8DEPENDS += "libffi python-argparse-native" 8DEPENDS += "libffi python-argparse-native"
9DEPENDS_virtclass-native += "libffi-native python-argparse-native"
9 10
10SRC_URI = "git://git.gnome.org/glib;protocol=git;branch=master \ 11SRC_URI = "git://git.gnome.org/glib;protocol=git;branch=master \
11 file://configure-libtool.patch \ 12 file://configure-libtool.patch \
12 file://60_wait-longer-for-threads-to-die.patch \ 13 file://60_wait-longer-for-threads-to-die.patch \
13 file://g_once_init_enter.patch \ 14 file://g_once_init_enter.patch \
14 file://remove.test.for.qsort_r.patch \ 15 file://remove.test.for.qsort_r.patch \
15 " 16 "
16SRCREV = "d97cbc6731deab137770bc0fe9c69b06f689f5b4" 17SRCREV = "d97cbc6731deab137770bc0fe9c69b06f689f5b4"
17PV = "2.29.3+gitr${SRCPV}" 18PV = "2.29.3+gitr${SRCPV}"
@@ -27,4 +28,5 @@ do_configure_prepend() {
27 # missing ${topdir}/gtk-doc.make and --disable-gtk-doc* is not enough, because it calls gtkdocize (not provided by gtk-doc-native) 28 # missing ${topdir}/gtk-doc.make and --disable-gtk-doc* is not enough, because it calls gtkdocize (not provided by gtk-doc-native)
28 sed -i '/^docs/d' ${S}/configure.ac 29 sed -i '/^docs/d' ${S}/configure.ac
29 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 30 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
31 sed -i -e "s:TEST_PROGS += gdbus-serialization::g" ${S}/gio/tests/Makefile.am
30} 32}