From 7d25239cea5bb0a198442fd1a16ca3f5f107fb38 Mon Sep 17 00:00:00 2001 From: Sagaert Johan Date: Thu, 1 May 2014 00:45:00 +0200 Subject: [PATCH] libwebsockets : bump version bump to v1.23-chrome32-firefox24 The latest releases use the cmake build infrastructure. Converted the makefile to the cmake infrastructure. The autotools infrastructure is no longer supported. [Peter: correct license data, ensure it gets built after openssl if enabled] Signed-off-by: Sagaert Johan Signed-off-by: Peter Korsgaard --- package/libwebsockets/libwebsockets.mk | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/package/libwebsockets/libwebsockets.mk b/package/libwebsockets/libwebsockets.mk index ec5244cf39..03c57209a3 100644 --- a/package/libwebsockets/libwebsockets.mk +++ b/package/libwebsockets/libwebsockets.mk @@ -4,14 +4,20 @@ # ################################################################################ -LIBWEBSOCKETS_VERSION = v1.22-chrome26-firefox18 +LIBWEBSOCKETS_VERSION = v1.23-chrome32-firefox24 LIBWEBSOCKETS_SOURCE = libwebsockets-$(LIBWEBSOCKETS_VERSION).tar.xz LIBWEBSOCKETS_SITE = http://git.libwebsockets.org/cgi-bin/cgit/libwebsockets/snapshot -LIBWEBSOCKETS_LICENSE = LGPLv2.1 -LIBWEBSOCKETS_LICENSE_FILES = COPYING +LIBWEBSOCKETS_LICENSE = LGPLv2.1 with exceptions +LIBWEBSOCKETS_LICENSE_FILES = LICENSE LIBWEBSOCKETS_DEPENDENCIES = zlib -LIBWEBSOCKETS_AUTORECONF = YES -LIBWEBSOCKETS_CONF_OPT = --without-testapps LIBWEBSOCKETS_INSTALL_STAGING = YES -$(eval $(autotools-package)) +LIBWEBSOCKETS_CONF_OPT += -DWITHOUT_TESTAPPS=ON + +ifeq ($(BR2_PACKAGE_OPENSSL),y) +LIBWEBSOCKETS_DEPENDENCIES += openssl +else +LIBWEBSOCKETS_CONF_OPT += -DWITH_SSL=OFF +endif + +$(eval $(cmake-package)) -- 2.30.2