From 5ba3cebb153838fe4821091cadb15197cddbbd83 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sun, 6 Jun 2010 19:42:12 +0200 Subject: [PATCH] gnome-bluetooth 2.30: fix a libtool issue where the 'test' line is true for '=', '==' *and* '!=', so disable the abort --- recipes/gnome/gnome-bluetooth_2.30.0.bb | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/recipes/gnome/gnome-bluetooth_2.30.0.bb b/recipes/gnome/gnome-bluetooth_2.30.0.bb index 6e01af1f84..833fca0e68 100644 --- a/recipes/gnome/gnome-bluetooth_2.30.0.bb +++ b/recipes/gnome/gnome-bluetooth_2.30.0.bb @@ -1,7 +1,9 @@ DESCRIPTION = "GNOME bluetooth manager" LICENSE = "GPL" SECTION = "x11/gnome" -DEPENDS = "obexd obex-data-server gconf gtk+ dbus-glib libunique libnotify hal bluez4 gnome-keyring" +DEPENDS = "gnome-doc-utils-native obexd obex-data-server gconf gtk+ dbus-glib libunique libnotify hal bluez4 gnome-keyring" + +PR = "r1" inherit gnome @@ -11,14 +13,12 @@ SRC_URI[archive.sha256sum] = "4caafa8c28195c81d8c51414f3a64489f81b9b46cac56979ae # No 'nautilus-sendto' recipe in OE et EXTRA_OECONF = "--enable-nautilus-sendto=no" +do_configure_append() { + sed -i 's,func_fatal_error "error: cannot install,echo "bogus message about,' ${TARGET_PREFIX}libtool +} + RRECOMMENDS_${PN} += "obexd obex-data-server" RCONFLICTS_${PN} = "bluez-gnome" -do_configure_prepend() { - sed -i -e s:docs::g ${S}/Makefile.am - echo "EXTRA_DIST = version.xml" > gnome-doc-utils.make - echo "EXTRA_DIST = version.xml" > gtk-doc.make -} - FILES_${PN}-dbg += "${libdir}/gnome-bluetooth/plugins/.debug/" -- 2.39.5