diff options
author | Richard Purdie <richard@openedhand.com> | 2007-10-15 10:21:02 +0000 |
---|---|---|
committer | Richard Purdie <richard@openedhand.com> | 2007-10-15 10:21:02 +0000 |
commit | c419af6b0a86fbd2d06c0eeb3a874fe3fe2bc3bf (patch) | |
tree | 23b3c3ad5b068ee1d101c89cd7b32d3487b0d279 /meta/packages/bluez | |
parent | bbcc43d1d8346aadd39925730ab9f5d074ce6775 (diff) | |
download | poky-c419af6b0a86fbd2d06c0eeb3a874fe3fe2bc3bf.tar.gz |
bluez-utils: Add patch to allow disabling of hal in configure
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2875 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/packages/bluez')
-rw-r--r-- | meta/packages/bluez/bluez-utils/allow-no-hal.patch | 26 | ||||
-rw-r--r-- | meta/packages/bluez/bluez-utils_3.18.bb | 4 |
2 files changed, 29 insertions, 1 deletions
diff --git a/meta/packages/bluez/bluez-utils/allow-no-hal.patch b/meta/packages/bluez/bluez-utils/allow-no-hal.patch new file mode 100644 index 0000000000..3350c80d69 --- /dev/null +++ b/meta/packages/bluez/bluez-utils/allow-no-hal.patch | |||
@@ -0,0 +1,26 @@ | |||
1 | --- | ||
2 | configure.in | 11 ++++++++++- | ||
3 | 1 file changed, 10 insertions(+), 1 deletion(-) | ||
4 | |||
5 | Index: bluez-utils-3.18/configure.in | ||
6 | =================================================================== | ||
7 | --- bluez-utils-3.18.orig/configure.in 2007-09-02 17:40:57.000000000 +0100 | ||
8 | +++ bluez-utils-3.18/configure.in 2007-10-15 11:45:01.000000000 +0100 | ||
9 | @@ -31,7 +31,16 @@ AC_PATH_ALSA | ||
10 | AC_PATH_GSTREAMER | ||
11 | AC_PATH_OPENOBEX | ||
12 | AC_PATH_OPENSYNC | ||
13 | -AC_PATH_HAL | ||
14 | + | ||
15 | +AC_DEFUN([AC_PATH_HAL], [ | ||
16 | + PKG_CHECK_MODULES(HAL, hal >= 0.5.8, hal_found=yes, hal_found=no) | ||
17 | +]) | ||
18 | + | ||
19 | +AC_SUBST(HAL_CFLAGS) | ||
20 | +AC_SUBST(HAL_LIBS) | ||
21 | + | ||
22 | +AM_CONDITIONAL(HAL, test "${hal_enable}" = "yes" && test "${hal_found}" = "yes") | ||
23 | + | ||
24 | AC_PATH_USB | ||
25 | AC_PATH_EXPAT | ||
26 | AC_PATH_INOTIFY | ||
diff --git a/meta/packages/bluez/bluez-utils_3.18.bb b/meta/packages/bluez/bluez-utils_3.18.bb index 3de342fa80..50004e3cb2 100644 --- a/meta/packages/bluez/bluez-utils_3.18.bb +++ b/meta/packages/bluez/bluez-utils_3.18.bb | |||
@@ -1,11 +1,13 @@ | |||
1 | require bluez-utils.inc | 1 | require bluez-utils.inc |
2 | 2 | ||
3 | DEPENDS += "glib-2.0" | 3 | DEPENDS += "glib-2.0" |
4 | PR = "r2" | 4 | PR = "r3" |
5 | 5 | ||
6 | # ti patch doesn't apply, people using it should rediff it and send it upstream | 6 | # ti patch doesn't apply, people using it should rediff it and send it upstream |
7 | #SRC_URI += "file://hciattach-ti-bts.patch;patch=1 " | 7 | #SRC_URI += "file://hciattach-ti-bts.patch;patch=1 " |
8 | 8 | ||
9 | SRC_URI += "file://allow-no-hal.patch;patch=1 " | ||
10 | |||
9 | EXTRA_OECONF = " \ | 11 | EXTRA_OECONF = " \ |
10 | --enable-bccmd \ | 12 | --enable-bccmd \ |
11 | --enable-hid2hci \ | 13 | --enable-hid2hci \ |