ohm: Use correct libtool

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2018 311d38ba-8fff-0310-9ca6-ca027cbcb966

2 files changed, 24 insertions, 2 deletions

diff --git a/meta/packages/ohm/files/libtool_fix.patch b/meta/packages/ohm/files/libtool_fix.patch
new file mode 100644
index 0000000000..09c473b3c1
--- /dev/null
+++ b/meta/packages/ohm/files/libtool_fix.patch
@@ -0,0 +1,21 @@
+---
+ ohmd/Makefile.am |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+Index: git/ohmd/Makefile.am
+===================================================================
+--- git.orig/ohmd/Makefile.am   2007-06-27 12:21:04.000000000 +0100
++++ git/ohmd/Makefile.am        2007-06-27 12:21:29.000000000 +0100
+@@ -69,10 +69,10 @@ ohm-marshal.h: ohm-marshal.list
+        @GLIB_GENMARSHAL@ $< --prefix=ohm_marshal --header > $@
+ 
+ ohm-dbus-manager.h: ohm-dbus-manager.xml
+-       libtool --mode=execute dbus-binding-tool --prefix=ohm_manager --mode=glib-server --output=ohm-dbus-manager.h $(srcdir)/ohm-dbus-manager.xml
++       $(LIBTOOL) --mode=execute dbus-binding-tool --prefix=ohm_manager --mode=glib-server --output=ohm-dbus-manager.h $(srcdir)/ohm-dbus-manager.xml
+ 
+ ohm-dbus-keystore.h: ohm-dbus-keystore.xml
+-       libtool --mode=execute dbus-binding-tool --prefix=ohm_keystore --mode=glib-server --output=ohm-dbus-keystore.h $(srcdir)/ohm-dbus-keystore.xml
++       $(LIBTOOL) --mode=execute dbus-binding-tool --prefix=ohm_keystore --mode=glib-server --output=ohm-dbus-keystore.h $(srcdir)/ohm-dbus-keystore.xml
+ 
+ CLEANFILES = $(BUILT_SOURCES)
+ 
diff --git a/meta/packages/ohm/ohm_git.bb b/meta/packages/ohm/ohm_git.bb
index 6eb96d6176..ae6976e372 100644
--- a/meta/packages/ohm/ohm_git.bb
+++ b/meta/packages/ohm/ohm_git.bb
@@ -4,10 +4,11 @@ LICENSE = "LGPL"
 
 DEPENDS = "dbus-glib intltool-native hal"
 RDEPENDS += "udev hal-info"
-SRC_URI = "git://anongit.freedesktop.org/git/ohm/;protocol=git"
+SRC_URI = "git://anongit.freedesktop.org/git/ohm/;protocol=git \
+           file://libtool_fix.patch;patch=1"
 
 PV = "0.0+git${SRCDATE}"
-PR = "r0"
+PR = "r1"
 
 S = "${WORKDIR}/git"