[oe-commits] org.oe.dev packages/bluez/bluez-utils: angstrom uclibc fixlet. Make custom ppoll not clash with sys/poll.h

[freyther commit]

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.

Author: freyther at openembedded.org
Branch: org.openembedded.dev
Revision: 3072b3ae79a98449f7e142fec2fc6a4f207406f6
ViewMTN: http://monotone.openembedded.org/revision.psp?id=3072b3ae79a98449f7e142fec2fc6a4f207406f6
Files:
1
packages/bluez/bluez-utils/ppoll-uclibc-arm-r0.patch
packages/bluez/bluez-utils_3.9.bb
Diffs:

#
# mt diff -r1ca0ede88a8098bb5aecc096c437b17e3779239a -r3072b3ae79a98449f7e142fec2fc6a4f207406f6
#
# 
# 
# add_file "packages/bluez/bluez-utils/ppoll-uclibc-arm-r0.patch"
#  content [f27dd13343012a06ad39cfcbe85942ec022848db]
# 
# patch "packages/bluez/bluez-utils_3.9.bb"
#  from [5b22d99203dab61b6a7194f64188e1b0a0bb104b]
#    to [ffdab4fb0f0afe086d93f30a4caaaacadf542711]
# 
============================================================
--- packages/bluez/bluez-utils/ppoll-uclibc-arm-r0.patch	f27dd13343012a06ad39cfcbe85942ec022848db
+++ packages/bluez/bluez-utils/ppoll-uclibc-arm-r0.patch	f27dd13343012a06ad39cfcbe85942ec022848db
@@ -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);
============================================================
--- packages/bluez/bluez-utils_3.9.bb	5b22d99203dab61b6a7194f64188e1b0a0bb104b
+++ packages/bluez/bluez-utils_3.9.bb	ffdab4fb0f0afe086d93f30a4caaaacadf542711
@@ -1,8 +1,9 @@ PACKAGES =+ "${PN}-ciptool"
 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"