* [Buildroot] [PATCH 1/2] package/libsigrok: add optional bluez-utils dependency
@ 2020-01-06 18:24 Fabrice Fontaine
2020-01-06 18:24 ` [Buildroot] [PATCH 2/2] package/bluez_utils: fix build with c99 Fabrice Fontaine
2020-01-10 22:13 ` [Buildroot] [PATCH 1/2] package/libsigrok: add optional bluez-utils dependency Thomas Petazzoni
0 siblings, 2 replies; 3+ messages in thread
From: Fabrice Fontaine @ 2020-01-06 18:24 UTC (permalink / raw)
To: buildroot
bluez-utils has been added since version 0.5.2 and
https://github.com/sigrokproject/libsigrok/commit/f085705f4888f8127c80539e0fcd1cb3974bdff2
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
package/libsigrok/libsigrok.mk | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/package/libsigrok/libsigrok.mk b/package/libsigrok/libsigrok.mk
index 971e90c94a..922011af7c 100644
--- a/package/libsigrok/libsigrok.mk
+++ b/package/libsigrok/libsigrok.mk
@@ -12,6 +12,16 @@ LIBSIGROK_INSTALL_STAGING = YES
LIBSIGROK_DEPENDENCIES = libglib2 libzip host-pkgconf
LIBSIGROK_CONF_OPTS = --disable-java --disable-python
+ifeq ($(BR2_PACKAGE_BLUEZ_UTILS),y)
+LIBSIGROK_CONF_OPTS += --with-libbluez
+LIBSIGROK_DEPENDENCIES += bluez_utils
+else ifeq ($(BR2_PACKAGE_BLUEZ5_UTILS),y)
+LIBSIGROK_CONF_OPTS += --with-libbluez
+LIBSIGROK_DEPENDENCIES += bluez_utils5
+else
+LIBSIGROK_CONF_OPTS += --without-libbluez
+endif
+
ifeq ($(BR2_PACKAGE_LIBSERIALPORT),y)
LIBSIGROK_CONF_OPTS += --with-libserialport
LIBSIGROK_DEPENDENCIES += libserialport
--
2.24.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [Buildroot] [PATCH 2/2] package/bluez_utils: fix build with c99
2020-01-06 18:24 [Buildroot] [PATCH 1/2] package/libsigrok: add optional bluez-utils dependency Fabrice Fontaine
@ 2020-01-06 18:24 ` Fabrice Fontaine
2020-01-10 22:13 ` [Buildroot] [PATCH 1/2] package/libsigrok: add optional bluez-utils dependency Thomas Petazzoni
1 sibling, 0 replies; 3+ messages in thread
From: Fabrice Fontaine @ 2020-01-06 18:24 UTC (permalink / raw)
To: buildroot
This will fix a build failure with libsigrok
Fixes:
- http://autobuild.buildroot.org/results/005a16e63518716c6e99c74c618d01be453c76d4
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
.../0007-fix-lib-bluetooth-h-with-c99.patch | 31 +++++++++++++++++++
1 file changed, 31 insertions(+)
create mode 100644 package/bluez_utils/0007-fix-lib-bluetooth-h-with-c99.patch
diff --git a/package/bluez_utils/0007-fix-lib-bluetooth-h-with-c99.patch b/package/bluez_utils/0007-fix-lib-bluetooth-h-with-c99.patch
new file mode 100644
index 0000000000..3738baf1f5
--- /dev/null
+++ b/package/bluez_utils/0007-fix-lib-bluetooth-h-with-c99.patch
@@ -0,0 +1,31 @@
+http://permalink.gmane.org/gmane.linux.bluez.kernel/22306
+
+[Retrieved from:
+https://428282.bugs.gentoo.org/attachment.cgi?id=319374]
+Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+
+diff --git a/lib/bluetooth.h b/lib/bluetooth.h
+index 0541842..5b2153d 100644
+--- a/lib/bluetooth.h
++++ b/lib/bluetooth.h
+@@ -140,16 +140,16 @@ enum {
+ #define bt_get_unaligned(ptr) \
+ ({ \
+ struct __attribute__((packed)) { \
+- typeof(*(ptr)) __v; \
+- } *__p = (typeof(__p)) (ptr); \
++ __typeof__(*(ptr)) __v; \
++ } *__p = (__typeof__(__p)) (ptr); \
+ __p->__v; \
+ })
+
+ #define bt_put_unaligned(val, ptr) \
+ do { \
+ struct __attribute__((packed)) { \
+- typeof(*(ptr)) __v; \
+- } *__p = (typeof(__p)) (ptr); \
++ __typeof__(*(ptr)) __v; \
++ } *__p = (__typeof__(__p)) (ptr); \
+ __p->__v = (val); \
+ } while(0)
+
--
2.24.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [Buildroot] [PATCH 1/2] package/libsigrok: add optional bluez-utils dependency
2020-01-06 18:24 [Buildroot] [PATCH 1/2] package/libsigrok: add optional bluez-utils dependency Fabrice Fontaine
2020-01-06 18:24 ` [Buildroot] [PATCH 2/2] package/bluez_utils: fix build with c99 Fabrice Fontaine
@ 2020-01-10 22:13 ` Thomas Petazzoni
1 sibling, 0 replies; 3+ messages in thread
From: Thomas Petazzoni @ 2020-01-10 22:13 UTC (permalink / raw)
To: buildroot
On Mon, 6 Jan 2020 19:24:19 +0100
Fabrice Fontaine <fontaine.fabrice@gmail.com> wrote:
> bluez-utils has been added since version 0.5.2 and
> https://github.com/sigrokproject/libsigrok/commit/f085705f4888f8127c80539e0fcd1cb3974bdff2
>
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> ---
> package/libsigrok/libsigrok.mk | 10 ++++++++++
> 1 file changed, 10 insertions(+)
Both patches applied. That being said, I think it is probably time to
remove the bluez_utils package from Buildroot. The 4.x version of BlueZ
is deprecated since a very long time.
Thomas
--
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-01-10 22:13 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-01-06 18:24 [Buildroot] [PATCH 1/2] package/libsigrok: add optional bluez-utils dependency Fabrice Fontaine
2020-01-06 18:24 ` [Buildroot] [PATCH 2/2] package/bluez_utils: fix build with c99 Fabrice Fontaine
2020-01-10 22:13 ` [Buildroot] [PATCH 1/2] package/libsigrok: add optional bluez-utils dependency Thomas Petazzoni
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.