diff options
author | Ross Burton <ross@openedhand.com> | 2007-09-04 13:22:03 +0000 |
---|---|---|
committer | Ross Burton <ross@openedhand.com> | 2007-09-04 13:22:03 +0000 |
commit | 75fadfe1c8b8b9b18ae5dbcbb8aa76efd319548e (patch) | |
tree | 94ba7ee96a804939a66e7680ba1afe3fa68b2181 /meta/packages/ohm/ohm_git.bb | |
parent | 56e0055f4e5362fdade9af6f5947274aa6cc2919 (diff) | |
download | poky-75fadfe1c8b8b9b18ae5dbcbb8aa76efd319548e.tar.gz |
Update and lock OHM down to a working revision, also remove some crack
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2685 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/packages/ohm/ohm_git.bb')
-rw-r--r-- | meta/packages/ohm/ohm_git.bb | 28 |
1 files changed, 12 insertions, 16 deletions
diff --git a/meta/packages/ohm/ohm_git.bb b/meta/packages/ohm/ohm_git.bb index ae338bf2da..9cdea709cf 100644 --- a/meta/packages/ohm/ohm_git.bb +++ b/meta/packages/ohm/ohm_git.bb | |||
@@ -7,20 +7,19 @@ RDEPENDS_${PN} += "udev hal-info" | |||
7 | SRC_URI = "git://anongit.freedesktop.org/git/ohm/;protocol=git" | 7 | SRC_URI = "git://anongit.freedesktop.org/git/ohm/;protocol=git" |
8 | 8 | ||
9 | PV = "0.0+git${SRCDATE}" | 9 | PV = "0.0+git${SRCDATE}" |
10 | PR = "r3" | 10 | PR = "r4" |
11 | 11 | ||
12 | S = "${WORKDIR}/git" | 12 | S = "${WORKDIR}/git" |
13 | 13 | ||
14 | inherit autotools pkgconfig | 14 | inherit autotools pkgconfig |
15 | 15 | ||
16 | EXTRA_OECONF = "--with-distro=debian --disable-gtk-doc --with-xauth-dir=/home/root" | 16 | EXTRA_OECONF = "--with-distro=debian \ |
17 | --with-xauth-dir=/home/root \ | ||
18 | --disable-gtk-doc \ | ||
19 | --disable-docbook-docs" | ||
17 | 20 | ||
18 | do_configure_prepend() { | 21 | do_configure_prepend() { |
19 | touch gtk-doc.make | 22 | touch gtk-doc.make |
20 | } | ||
21 | |||
22 | do_configure_append() { | ||
23 | rm config.log | ||
24 | } | 23 | } |
25 | 24 | ||
26 | OE_LT_RPATH_ALLOW=":${libdir}/libohm:" | 25 | OE_LT_RPATH_ALLOW=":${libdir}/libohm:" |
@@ -28,20 +27,17 @@ OE_LT_RPATH_ALLOW[export]="1" | |||
28 | 27 | ||
29 | PACKAGES =+ "libohm ohm-plugin-x11" | 28 | PACKAGES =+ "libohm ohm-plugin-x11" |
30 | 29 | ||
31 | FILES_${PN}-dev += "${libdir}/ohm/*.la \ | 30 | FILES_${PN}-dev += "${libdir}/ohm/*.a" |
32 | ${libdir}/ohm/*.a " | ||
33 | 31 | ||
34 | FILES_${PN} = "${sysconfdir} \ | 32 | FILES_${PN} = "${sysconfdir} \ |
35 | ${bindir}/* \ | 33 | ${bindir}/* \ |
36 | ${sbindir}/* \ | 34 | ${sbindir}/* \ |
37 | ${libdir}/ohm/*.so \ | 35 | ${libdir}/ohm/*.so \ |
38 | " | 36 | " |
39 | 37 | ||
40 | FILES_libohm = "${libdir}/libohm.so.*" | 38 | FILES_libohm = "${libdir}/libohm.so.*" |
41 | FILES_ohm-plugin-x11 = "${libdir}/ohm/libohm_x*.so \ | 39 | FILES_ohm-plugin-x11 = "${libdir}/ohm/libohm_x*.so \ |
42 | ${libdir}/ohm/libohm_idle.so \ | 40 | ${libdir}/ohm/libohm_idle.so \ |
43 | ${sysconfdir}/ohm/plugins.d/x* \ | 41 | ${sysconfdir}/ohm/plugins.d/x* \ |
44 | ${sysconfdir}/ohm/plugins.d/idle* \ | 42 | ${sysconfdir}/ohm/plugins.d/idle* \ |
45 | " | 43 | " |
46 | |||
47 | |||