summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2007-06-27 11:11:08 +0000
committerRichard Purdie <richard@openedhand.com>2007-06-27 11:11:08 +0000
commite52e38e63708f6e52e4af73faa3616e240382327 (patch)
tree1059d4bec2bc6ad3a6c6414ac874fd3dd075aa47 /meta
parent660d9d6228d42a76cda16ceb461dc17189de8e86 (diff)
downloadpoky-e52e38e63708f6e52e4af73faa3616e240382327.tar.gz
ohm: Use correct libtool
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2018 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta')
-rw-r--r--meta/packages/ohm/files/libtool_fix.patch21
-rw-r--r--meta/packages/ohm/ohm_git.bb5
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 @@
1---
2 ohmd/Makefile.am | 4 ++--
3 1 file changed, 2 insertions(+), 2 deletions(-)
4
5Index: git/ohmd/Makefile.am
6===================================================================
7--- git.orig/ohmd/Makefile.am 2007-06-27 12:21:04.000000000 +0100
8+++ git/ohmd/Makefile.am 2007-06-27 12:21:29.000000000 +0100
9@@ -69,10 +69,10 @@ ohm-marshal.h: ohm-marshal.list
10 @GLIB_GENMARSHAL@ $< --prefix=ohm_marshal --header > $@
11
12 ohm-dbus-manager.h: ohm-dbus-manager.xml
13- libtool --mode=execute dbus-binding-tool --prefix=ohm_manager --mode=glib-server --output=ohm-dbus-manager.h $(srcdir)/ohm-dbus-manager.xml
14+ $(LIBTOOL) --mode=execute dbus-binding-tool --prefix=ohm_manager --mode=glib-server --output=ohm-dbus-manager.h $(srcdir)/ohm-dbus-manager.xml
15
16 ohm-dbus-keystore.h: ohm-dbus-keystore.xml
17- libtool --mode=execute dbus-binding-tool --prefix=ohm_keystore --mode=glib-server --output=ohm-dbus-keystore.h $(srcdir)/ohm-dbus-keystore.xml
18+ $(LIBTOOL) --mode=execute dbus-binding-tool --prefix=ohm_keystore --mode=glib-server --output=ohm-dbus-keystore.h $(srcdir)/ohm-dbus-keystore.xml
19
20 CLEANFILES = $(BUILT_SOURCES)
21
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"
4 4
5DEPENDS = "dbus-glib intltool-native hal" 5DEPENDS = "dbus-glib intltool-native hal"
6RDEPENDS += "udev hal-info" 6RDEPENDS += "udev hal-info"
7SRC_URI = "git://anongit.freedesktop.org/git/ohm/;protocol=git" 7SRC_URI = "git://anongit.freedesktop.org/git/ohm/;protocol=git \
8 file://libtool_fix.patch;patch=1"
8 9
9PV = "0.0+git${SRCDATE}" 10PV = "0.0+git${SRCDATE}"
10PR = "r0" 11PR = "r1"
11 12
12S = "${WORKDIR}/git" 13S = "${WORKDIR}/git"
13 14