openRuyi-tutorials/buildroot
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

package/libwebsockets: fix build with libev and libevent

Browse Source 
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 <fontaine.fabrice@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
Fabrice Fontaine
2019-10-06 14:53:38 +02:00
committed by Thomas Petazzoni
parent cb53f51666
commit 27f257e98d
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
package/libwebsockets/libwebsockets.mk
+10 -8
View File
@@ -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)