libwebsockets: fix build for cyassl variant
authorAlexandru Ardelean <redacted>
Wed, 30 Aug 2017 13:37:58 +0000 (16:37 +0300)
committerKarl Palsson <redacted>
Fri, 1 Sep 2017 11:44:15 +0000 (11:44 +0000)
Looks like the cyassl redirect to wolfssl does not work flawlessly in libwebsockets.

Tested with libwolfssl 3.12.0 & 3.10.0 from LEDE.

Signed-off-by: Alexandru Ardelean <redacted>
libs/libwebsockets/Makefile

index 86c27c6fd32ce20de136c76337e7ac1be10c5b4a..db1868a88f35524c30fa71d2ee35b49794561e95 100644 (file)
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libwebsockets
 PKG_VERSION:=2.2.1
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
@@ -81,9 +81,9 @@ ifeq ($(BUILD_VARIANT),cyassl)
     CMAKE_OPTIONS += -DLWS_WITH_SSL=ON
 # for cyassl, edit package/libs/cyassl/Makefile to include --enable-opensslextra
 # NOTE: it will compile without it, untested whether it it's needed?!
-    CMAKE_OPTIONS += -DLWS_USE_CYASSL=ON
-    CMAKE_OPTIONS += -DLWS_CYASSL_LIBRARIES=$(STAGING_DIR)/usr/lib/libcyassl.so
-    CMAKE_OPTIONS += -DLWS_CYASSL_INCLUDE_DIRS=$(STAGING_DIR)/usr/include
+    CMAKE_OPTIONS += -DLWS_USE_WOLFSSL=ON
+    CMAKE_OPTIONS += -DLWS_WOLFSSL_LIBRARIES=$(STAGING_DIR)/usr/lib/libwolfssl.so
+    CMAKE_OPTIONS += -DLWS_WOLFSSL_INCLUDE_DIRS=$(STAGING_DIR)/usr/include
 endif
 
 ifeq ($(BUILD_VARIANT),full)
git clone https://git.99rst.org/PROJECT