[Buildroot] [git commit] package/libwebsockets: fix build with libev and libevent
From: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Date: 2019-10-07 20:46:50
Subsystem:
the rest · Maintainer:
Linus Torvalds
commit: https://git.buildroot.net/buildroot/commit/?id=27f257e98d7cc70f1bf79d46c2ddf9dc9511c0b6 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master libev and libevent can't be enabled at the same time since version 3.0.0 and https://github.com/warmcat/libwebsockets/commit/ff2f5f601d5965f5860bc989d05b61246f172095 So prefer libev over libevent to have the same default behavior than upstream LWS_WITH_DISTRO_RECOMMENDED target Fixes: - http://autobuild.buildroot.org/results/ee5ef79a39570bcf5c605b1a4b6b48523605d647 Signed-off-by: Fabrice Fontaine <redacted> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com> --- package/libwebsockets/libwebsockets.mk | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-)
diff --git a/package/libwebsockets/libwebsockets.mk b/package/libwebsockets/libwebsockets.mk
index 0b488d1f05..7a065dfb22 100644
--- a/package/libwebsockets/libwebsockets.mk
+++ b/package/libwebsockets/libwebsockets.mk@@ -30,16 +30,18 @@ endif ifeq ($(BR2_PACKAGE_LIBEV),y) LIBWEBSOCKETS_DEPENDENCIES += libev -LIBWEBSOCKETS_CONF_OPTS += -DLWS_WITH_LIBEV=ON -else -LIBWEBSOCKETS_CONF_OPTS += -DLWS_WITH_LIBEV=OFF -endif - -ifeq ($(BR2_PACKAGE_LIBEVENT),y) +LIBWEBSOCKETS_CONF_OPTS += \ + -DLWS_WITH_LIBEV=ON \ + -DLWS_WITH_LIBEVENT=OFF +else ifeq ($(BR2_PACKAGE_LIBEVENT),y) LIBWEBSOCKETS_DEPENDENCIES += libevent -LIBWEBSOCKETS_CONF_OPTS += -DLWS_WITH_LIBEVENT=ON +LIBWEBSOCKETS_CONF_OPTS += \ + -DLWS_WITH_LIBEV=OFF \ + -DLWS_WITH_LIBEVENT=ON else -LIBWEBSOCKETS_CONF_OPTS += -DLWS_WITH_LIBEVENT=OFF +LIBWEBSOCKETS_CONF_OPTS += \ + -DLWS_WITH_LIBEV=OFF \ + -DLWS_WITH_LIBEVENT=OFF endif ifeq ($(BR2_PACKAGE_LIBUV),y)