summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-core/glib-2.0/glib-2.0/nodbus.patch23
-rw-r--r--meta/recipes-core/glib-2.0/glib-2.0_2.30.2.bb3
-rw-r--r--meta/recipes-core/glib-2.0/glib.inc4
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 @@
1Disable dbus dependency. Autodetecting isn't deterministic, we don't have the DEPENDS
2and we don't want to built this piece so hardcode it off.
3
4RP 2012/2/25
5
6Index: glib-2.30.2/configure.ac
7===================================================================
8--- glib-2.30.2.orig/configure.ac 2012-02-25 14:50:07.444242397 +0000
9+++ glib-2.30.2/configure.ac 2012-02-25 14:51:28.096240485 +0000
10@@ -3769,10 +3769,9 @@
11 # Check for libdbus1 - Optional - is only used in the GDBus test cases
12 #
13 # 1.2.14 required for dbus_message_set_serial
14-PKG_CHECK_MODULES(DBUS1,
15- dbus-1 >= 1.2.14,
16- [AC_DEFINE(HAVE_DBUS1, 1, [Define if dbus-1 is available]) have_dbus1=yes],
17- have_dbus1=no)
18+DBUS1_CFLAGS=
19+DBUS1_LIBS=
20+$have_dbus1=no
21 AC_SUBST(DBUS1_CFLAGS)
22 AC_SUBST(DBUS1_LIBS)
23 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 @@
1require glib.inc 1require glib.inc
2 2
3PR = "r5" 3PR = "r6"
4PE = "1" 4PE = "1"
5 5
6DEPENDS += "libffi python-argparse-native zlib" 6DEPENDS += "libffi python-argparse-native zlib"
@@ -14,6 +14,7 @@ SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.bz2 \
14 file://60_wait-longer-for-threads-to-die.patch \ 14 file://60_wait-longer-for-threads-to-die.patch \
15 file://g_once_init_enter.patch \ 15 file://g_once_init_enter.patch \
16 file://glib-2.0_fix_for_x32.patch \ 16 file://glib-2.0_fix_for_x32.patch \
17 file://nodbus.patch \
17 " 18 "
18SRC_URI[md5sum] = "b40f3889e8d24e1b367763673ca6deb5" 19SRC_URI[md5sum] = "b40f3889e8d24e1b367763673ca6deb5"
19SRC_URI[sha256sum] = "94b1f1a1456c67060ca868d299bef3f7268a2c1c5c360aabb7149d4d9b2fdcd3" 20SRC_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 \
13BUGTRACKER = "http://bugzilla.gnome.org" 13BUGTRACKER = "http://bugzilla.gnome.org"
14SECTION = "libs" 14SECTION = "libs"
15 15
16DEPENDS = "glib-2.0-native gtk-doc-native zip dbus" 16DEPENDS = "glib-2.0-native gtk-doc-native zip"
17DEPENDS_virtclass-native = "gtk-doc-native pkgconfig-native gettext-native dbus-native" 17DEPENDS_virtclass-native = "gtk-doc-native pkgconfig-native gettext-native"
18DEPENDS_virtclass-nativesdk = "libtool-nativesdk" 18DEPENDS_virtclass-nativesdk = "libtool-nativesdk"
19PACKAGES =+ "${PN}-utils " 19PACKAGES =+ "${PN}-utils "
20 20