summaryrefslogtreecommitdiffstats
path: root/package/libwebsockets/libwebsockets.mk
diff options
context:
space:
mode:
authorSagaert Johan <sagaert.johan@skynet.be>2014-10-31 14:49:02 +0100
committerThomas Petazzoni <thomas.petazzoni@free-electrons.com>2014-11-01 18:16:45 +0100
commita1b4effcbbcf1edebe39c34ca497bb34897471d8 (patch)
tree876a38f2f33f4a85514c514525e8d49ab44d9b2d /package/libwebsockets/libwebsockets.mk
parent5d03ecb772c5e06e9c7ca3842ab674ad4687a61a (diff)
downloadbuildroot-a1b4effcbbcf1edebe39c34ca497bb34897471d8.tar.gz
buildroot-a1b4effcbbcf1edebe39c34ca497bb34897471d8.zip
libwebsockets : bump version to v1.3-chrome37-firefox30
Bumped the version and did some trivial reworking of the patch file : libwebsockets-0002-cmake-disable-shared-library-build-when-BUILD_SHARED.patch [Thomas: - Pass LWS_IPV6={ON,OFF} depending on the value of BR2_INET_IPV6, otherwise the build failed in a non-IPv6 configuration. - The name of the CMake option for OpenSSL support has changed, it's now LWS_WITH_SSL={ON,OFF}. - Adjust the description of patch 0002.] Signed-off-by: Sagaert Johan <sagaert.johan@skynet.be> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'package/libwebsockets/libwebsockets.mk')
-rw-r--r--package/libwebsockets/libwebsockets.mk11
1 files changed, 9 insertions, 2 deletions
diff --git a/package/libwebsockets/libwebsockets.mk b/package/libwebsockets/libwebsockets.mk
index 96b51cba87..71a520d7ac 100644
--- a/package/libwebsockets/libwebsockets.mk
+++ b/package/libwebsockets/libwebsockets.mk
@@ -4,7 +4,7 @@
#
################################################################################
-LIBWEBSOCKETS_VERSION = v1.23-chrome32-firefox24
+LIBWEBSOCKETS_VERSION = v1.3-chrome37-firefox30
LIBWEBSOCKETS_SOURCE = libwebsockets-$(LIBWEBSOCKETS_VERSION).tar.xz
LIBWEBSOCKETS_SITE = http://git.libwebsockets.org/cgi-bin/cgit/libwebsockets/snapshot
LIBWEBSOCKETS_LICENSE = LGPLv2.1 with exceptions
@@ -14,10 +14,17 @@ LIBWEBSOCKETS_INSTALL_STAGING = YES
LIBWEBSOCKETS_CONF_OPTS += -DWITHOUT_TESTAPPS=ON
+ifeq ($(BR2_INET_IPV6),y)
+LIBWEBSOCKETS_CONF_OPTS += -DLWS_IPV6=ON
+else
+LIBWEBSOCKETS_CONF_OPTS += -DLWS_IPV6=OFF
+endif
+
ifeq ($(BR2_PACKAGE_OPENSSL),y)
LIBWEBSOCKETS_DEPENDENCIES += openssl
+LIBWEBSOCKETS_CONF_OPTS += -DLWS_WITH_SSL=ON
else
-LIBWEBSOCKETS_CONF_OPTS += -DWITH_SSL=OFF
+LIBWEBSOCKETS_CONF_OPTS += -DLWS_WITH_SSL=OFF
endif
$(eval $(cmake-package))
OpenPOWER on IntegriCloud