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:56:44 +0000 |
commit | e17c709b430c783229bc804310e3d34b84a5f798 (patch) | |
tree | 5b7890c72e4dfe7bd47337f35a4b979147cb7c81 | |
parent | a54932dc373ec130f7a166d144f4d5744ec52097 (diff) | |
download | ast2050-yocto-poky-e17c709b430c783229bc804310e3d34b84a5f798.zip ast2050-yocto-poky-e17c709b430c783229bc804310e3d34b84a5f798.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.
(From OE-Core rev: 4642ae91cee2978956a61cf15df7ea62e3eb1726)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-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 0000000..1486203 --- /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 e2170bc..0b26575 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 d553869..6eddf8f 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 " |