diff options
| author |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-02-25 14:55:51 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-02-26 10:53:54 +0000 |
| commit | 4642ae91cee2978956a61cf15df7ea62e3eb1726 (patch) | |
| tree | a8f7a3402fad22fd43f24143a03612ab608ac6a1 /meta/recipes-core/glib-2.0 | |
| parent | c44e51f281101c8933679f679e3d4a75a41bedf7 (diff) | |
| download | openembedded-core-4642ae91cee2978956a61cf15df7ea62e3eb1726.tar.gz | |
glib: Drop dbus dependency, it isn't useful
dbus is only needed for some of the glib tests which we don't use. We can
therefore drop the dependency and gain some small parallelism gains.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/glib-2.0')
| -rw-r--r-- | meta/recipes-core/glib-2.0/glib-2.0/nodbus.patch | 23 | ||||
| -rw-r--r-- | meta/recipes-core/glib-2.0/glib-2.0_2.30.2.bb | 3 | ||||
| -rw-r--r-- | meta/recipes-core/glib-2.0/glib.inc | 4 |
3 files changed, 27 insertions, 3 deletions
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/nodbus.patch b/meta/recipes-core/glib-2.0/glib-2.0/nodbus.patch new file mode 100644 index 0000000000..1486203cf5 --- /dev/null +++ b/meta/recipes-core/glib-2.0/glib-2.0/nodbus.patch @@ -0,0 +1,23 @@ +Disable dbus dependency. Autodetecting isn't deterministic, we don't have the DEPENDS +and we don't want to built this piece so hardcode it off. + +RP 2012/2/25 + +Index: glib-2.30.2/configure.ac +=================================================================== +--- glib-2.30.2.orig/configure.ac 2012-02-25 14:50:07.444242397 +0000 ++++ glib-2.30.2/configure.ac 2012-02-25 14:51:28.096240485 +0000 +@@ -3769,10 +3769,9 @@ + # Check for libdbus1 - Optional - is only used in the GDBus test cases + # + # 1.2.14 required for dbus_message_set_serial +-PKG_CHECK_MODULES(DBUS1, +- dbus-1 >= 1.2.14, +- [AC_DEFINE(HAVE_DBUS1, 1, [Define if dbus-1 is available]) have_dbus1=yes], +- have_dbus1=no) ++DBUS1_CFLAGS= ++DBUS1_LIBS= ++$have_dbus1=no + AC_SUBST(DBUS1_CFLAGS) + AC_SUBST(DBUS1_LIBS) + AM_CONDITIONAL(HAVE_DBUS1, [test "x$have_dbus1" = "xyes"]) diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.30.2.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.30.2.bb index e2170bca68..0b26575fc0 100644 --- a/meta/recipes-core/glib-2.0/glib-2.0_2.30.2.bb +++ b/meta/recipes-core/glib-2.0/glib-2.0_2.30.2.bb @@ -1,6 +1,6 @@ require glib.inc -PR = "r5" +PR = "r6" PE = "1" DEPENDS += "libffi python-argparse-native zlib" @@ -14,6 +14,7 @@ SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.bz2 \ file://60_wait-longer-for-threads-to-die.patch \ file://g_once_init_enter.patch \ file://glib-2.0_fix_for_x32.patch \ + file://nodbus.patch \ " SRC_URI[md5sum] = "b40f3889e8d24e1b367763673ca6deb5" SRC_URI[sha256sum] = "94b1f1a1456c67060ca868d299bef3f7268a2c1c5c360aabb7149d4d9b2fdcd3" diff --git a/meta/recipes-core/glib-2.0/glib.inc b/meta/recipes-core/glib-2.0/glib.inc index d553869f65..6eddf8f2a6 100644 --- a/meta/recipes-core/glib-2.0/glib.inc +++ b/meta/recipes-core/glib-2.0/glib.inc @@ -13,8 +13,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \ BUGTRACKER = "http://bugzilla.gnome.org" SECTION = "libs" -DEPENDS = "glib-2.0-native gtk-doc-native zip dbus" -DEPENDS_virtclass-native = "gtk-doc-native pkgconfig-native gettext-native dbus-native" +DEPENDS = "glib-2.0-native gtk-doc-native zip" +DEPENDS_virtclass-native = "gtk-doc-native pkgconfig-native gettext-native" DEPENDS_virtclass-nativesdk = "libtool-nativesdk" PACKAGES =+ "${PN}-utils " |