diff options
author | Richard Purdie <rpurdie@linux.intel.com> | 2010-09-01 19:09:11 +0100 |
---|---|---|
committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-09-01 19:09:57 +0100 |
commit | d62ee7eaf2ba025c3f64b2d4e10dc7cec4637612 (patch) | |
tree | f36fe3008f36ff75cbdd31b630f8f13f1f205ebb /meta/packages/ohm | |
parent | caab7fc509bf27706ff3248689f6afd04225cfda (diff) | |
download | poky-d62ee7eaf2ba025c3f64b2d4e10dc7cec4637612.tar.gz |
packages: Separate out most of the remaining packages into recipes
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'meta/packages/ohm')
-rw-r--r-- | meta/packages/ohm/ohm/fix_configure.patch | 39 | ||||
-rw-r--r-- | meta/packages/ohm/ohm_git.bb | 44 |
2 files changed, 0 insertions, 83 deletions
diff --git a/meta/packages/ohm/ohm/fix_configure.patch b/meta/packages/ohm/ohm/fix_configure.patch deleted file mode 100644 index e4b774e785..0000000000 --- a/meta/packages/ohm/ohm/fix_configure.patch +++ /dev/null | |||
@@ -1,39 +0,0 @@ | |||
1 | Index: git/configure.in | ||
2 | =================================================================== | ||
3 | --- git.orig/configure.in 2007-12-19 13:43:52.000000000 +0000 | ||
4 | +++ git/configure.in 2008-03-06 23:59:57.000000000 +0000 | ||
5 | @@ -201,9 +201,6 @@ | ||
6 | # Like AC_CHECK_HEADER, but it uses the already-computed -I directories. | ||
7 | AC_DEFUN(AC_CHECK_X_HEADER, [ | ||
8 | ac_save_CPPFLAGS="$CPPFLAGS" | ||
9 | - if test \! -z "$includedir" ; then | ||
10 | - CPPFLAGS="$CPPFLAGS -I$includedir" | ||
11 | - fi | ||
12 | CPPFLAGS="$CPPFLAGS $X_CFLAGS" | ||
13 | AC_CHECK_HEADER([$1],[$2],[$3],[$4]) | ||
14 | CPPFLAGS="$ac_save_CPPFLAGS"]) | ||
15 | @@ -211,9 +208,6 @@ | ||
16 | # Like AC_TRY_COMPILE, but it uses the already-computed -I directories. | ||
17 | AC_DEFUN(AC_TRY_X_COMPILE, [ | ||
18 | ac_save_CPPFLAGS="$CPPFLAGS" | ||
19 | - if test \! -z "$includedir" ; then | ||
20 | - CPPFLAGS="$CPPFLAGS -I$includedir" | ||
21 | - fi | ||
22 | CPPFLAGS="$CPPFLAGS $X_CFLAGS" | ||
23 | AC_TRY_COMPILE([$1], [$2], [$3], [$4]) | ||
24 | CPPFLAGS="$ac_save_CPPFLAGS"]) | ||
25 | @@ -224,14 +218,8 @@ | ||
26 | ac_save_CPPFLAGS="$CPPFLAGS" | ||
27 | ac_save_LDFLAGS="$LDFLAGS" | ||
28 | # ac_save_LIBS="$LIBS" | ||
29 | - if test \! -z "$includedir" ; then | ||
30 | - CPPFLAGS="$CPPFLAGS -I$includedir" | ||
31 | - fi | ||
32 | # note: $X_CFLAGS includes $x_includes | ||
33 | CPPFLAGS="$CPPFLAGS $X_CFLAGS" | ||
34 | - if test \! -z "$libdir" ; then | ||
35 | - LDFLAGS="$LDFLAGS -L$libdir" | ||
36 | - fi | ||
37 | # note: $X_LIBS includes $x_libraries | ||
38 | LDFLAGS="$LDFLAGS $ALL_X_LIBS" | ||
39 | AC_CHECK_LIB([$1], [$2], [$3], [$4], [$5]) | ||
diff --git a/meta/packages/ohm/ohm_git.bb b/meta/packages/ohm/ohm_git.bb deleted file mode 100644 index 2ba78b35ab..0000000000 --- a/meta/packages/ohm/ohm_git.bb +++ /dev/null | |||
@@ -1,44 +0,0 @@ | |||
1 | DESCRIPTION = "Open Hardware Manager" | ||
2 | HOMEPAGE = "http://freedesktop.org/Software/ohm" | ||
3 | LICENSE = "LGPL" | ||
4 | |||
5 | DEPENDS = "gtk+ dbus-glib intltool-native hal" | ||
6 | RDEPENDS_${PN} += "udev hal-info" | ||
7 | SRC_URI = "git://anongit.freedesktop.org/git/ohm/;protocol=git \ | ||
8 | file://fix_configure.patch;patch=1" | ||
9 | |||
10 | PV = "0.1.2+git-locrev${SRCREV}" | ||
11 | PR = "r1" | ||
12 | |||
13 | S = "${WORKDIR}/git" | ||
14 | |||
15 | inherit autotools pkgconfig | ||
16 | |||
17 | EXTRA_OECONF = "--with-distro=debian \ | ||
18 | --without-xauth \ | ||
19 | --disable-gtk-doc \ | ||
20 | --disable-docbook-docs" | ||
21 | |||
22 | do_configure_prepend() { | ||
23 | touch gtk-doc.make | ||
24 | } | ||
25 | |||
26 | OE_LT_RPATH_ALLOW=":${libdir}/libohm:" | ||
27 | OE_LT_RPATH_ALLOW[export]="1" | ||
28 | |||
29 | PACKAGES =+ "libohm ohm-plugin-x11" | ||
30 | |||
31 | FILES_${PN}-dev += "${libdir}/ohm/*.a" | ||
32 | |||
33 | FILES_${PN} = "${sysconfdir} \ | ||
34 | ${bindir}/* \ | ||
35 | ${sbindir}/* \ | ||
36 | ${libdir}/ohm/*.so \ | ||
37 | " | ||
38 | |||
39 | FILES_libohm = "${libdir}/libohm.so.*" | ||
40 | FILES_ohm-plugin-x11 = "${libdir}/ohm/libohm_x*.so \ | ||
41 | ${libdir}/ohm/libohm_idle.so \ | ||
42 | ${sysconfdir}/ohm/plugins.d/x* \ | ||
43 | ${sysconfdir}/ohm/plugins.d/idle* \ | ||
44 | " | ||