diff options
| author | Holger Freyther <zecke@selfish.org> | 2007-05-17 16:02:55 +0000 |
|---|---|---|
| committer | Holger Freyther <zecke@selfish.org> | 2007-05-17 16:02:55 +0000 |
| commit | 395129424bf741ae06cee6d1b8939b0f75fef180 (patch) | |
| tree | 24b942d315770c2dfb611a5a7d053ca6c5e6c786 /packages/bluez | |
| parent | 6c5fda9795cfa099293cc22a552fcf593d132816 (diff) | |
packages/bluez/bluez-utils: angstrom uclibc fixlet. Make custom ppoll not clash with sys/poll.h
uclibc on ARM has no ppoll symbol but a declaration in sys/poll.h. Give
the bluez stub another name to avoid compile errors.
Diffstat (limited to 'packages/bluez')
| -rw-r--r-- | packages/bluez/bluez-utils/ppoll-uclibc-arm-r0.patch | 14 | ||||
| -rw-r--r-- | packages/bluez/bluez-utils_3.9.bb | 3 |
2 files changed, 16 insertions, 1 deletions
diff --git a/packages/bluez/bluez-utils/ppoll-uclibc-arm-r0.patch b/packages/bluez/bluez-utils/ppoll-uclibc-arm-r0.patch new file mode 100644 index 0000000000..391a7ae3de --- /dev/null +++ b/packages/bluez/bluez-utils/ppoll-uclibc-arm-r0.patch @@ -0,0 +1,14 @@ +Index: bluez-utils-3.9/common/ppoll.h +=================================================================== +--- bluez-utils-3.9.orig/common/ppoll.h 2007-05-17 17:42:23.000000000 +0200 ++++ bluez-utils-3.9/common/ppoll.h 2007-05-17 17:43:18.000000000 +0200 +@@ -1,4 +1,8 @@ +-static inline int ppoll(struct pollfd *fds, nfds_t nfds, ++#ifdef ppoll ++#undef ppoll ++#endif ++#define ppoll bluez_ppoll ++static inline int bluez_ppoll(struct pollfd *fds, nfds_t nfds, + const struct timespec *timeout, const sigset_t *sigmask) + { + return poll(fds, nfds, timeout ? timeout->tv_sec * 1000 : 500); diff --git a/packages/bluez/bluez-utils_3.9.bb b/packages/bluez/bluez-utils_3.9.bb index 60b5becd99..29c472fbbd 100644 --- a/packages/bluez/bluez-utils_3.9.bb +++ b/packages/bluez/bluez-utils_3.9.bb @@ -2,7 +2,8 @@ require bluez-utils.inc PACKAGES =+ "${PN}-ciptool" -SRC_URI += "file://uclibc-fix.patch;patch=1" +SRC_URI += "file://uclibc-fix.patch;patch=1 \ + file://ppoll-uclibc-arm-r0.patch;patch=1 " FILES_${PN}-ciptool = "/bin/ciptool" RREPLACES_${PN}-ciptool = "bluez-utils-dbus-ciptool" |