diff options
| author | Karl Palsson <karlp@etactica.com> | 2017-10-24 13:16:53 +0000 |
|---|---|---|
| committer | Karl Palsson <karlp@etactica.com> | 2017-10-25 10:53:25 +0000 |
| commit | c97d4999f846d1d8d9a5868e8da40c409608eb3a (patch) | |
| tree | 691c3833c7707d99e7210f722a2b79ec9f581129 /libs/libwebsockets | |
| parent | b1dc90e41dcad1582e399b2130d3b4ddedfc72fa (diff) | |
libwebsockets: Upgrade to 2.4.0 and drop wolfssl for mbedtls
Libwebsockets 2.4.0 now includes mbedtls as a first class citizen.
Drop the problematic and poorly supported wolf/cyassl variant and add
mbedtls variant instead.
Signed-off-by: Karl Palsson <karlp@etactica.com>
Diffstat (limited to 'libs/libwebsockets')
| -rw-r--r-- | libs/libwebsockets/Makefile | 34 |
1 files changed, 14 insertions, 20 deletions
diff --git a/libs/libwebsockets/Makefile b/libs/libwebsockets/Makefile index 0fcae5598..be1945d6f 100644 --- a/libs/libwebsockets/Makefile +++ b/libs/libwebsockets/Makefile @@ -8,13 +8,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libwebsockets -PKG_VERSION:=2.2.1 -PKG_RELEASE:=3 +PKG_VERSION:=2.4.0 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) PKG_SOURCE_URL:=https://codeload.github.com/warmcat/libwebsockets/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=e7f9eaef258e003c9ada0803a9a5636757a5bc0a58927858834fb38a87d18ad2 +PKG_HASH:=0dc355c1f9a660b98667cc616fa4c4fe08dacdaeff2d5cc9f74e49e9d4af2d95 PKG_SOURCE_VERSION:=v$(PKG_VERSION) @@ -43,9 +43,10 @@ define Package/libwebsockets/Default SECTION:=libs CATEGORY:=Libraries TITLE:=libwebsockets - DEPENDS:=+zlib + DEPENDS:=+zlib +libcap URL:=https://libwebsockets.org MAINTAINER:=Karl Palsson <karlp@etactica.com> + PROVIDES:= libwebsockets endef define Package/libwebsockets-openssl @@ -55,11 +56,11 @@ define Package/libwebsockets-openssl VARIANT:=openssl endef -define Package/libwebsockets-wolfssl - $(call Package/libwebsockets/Default) - TITLE += (WolfSSL) - DEPENDS += +libcyassl - VARIANT:=wolfssl +define Package/libwebsockets-mbedtls + $(call Package/$(PKG_NAME)/Default) + TITLE += (mbedTLS) + DEPENDS += +libmbedtls + VARIANT:=mbedtls endef define Package/libwebsockets-full @@ -75,15 +76,8 @@ ifeq ($(BUILD_VARIANT),openssl) CMAKE_OPTIONS += -DLWS_WITH_SSL=ON endif -ifeq ($(BUILD_VARIANT),wolfssl) - CMAKE_OPTIONS += -DLWS_OPENSSL_CLIENT_CERTS=/etc/ssl/certs - CMAKE_OPTIONS += -DLWS_OPENSSL_SUPPORT=ON - CMAKE_OPTIONS += -DLWS_WITH_SSL=ON -# for wolfssl, edit package/libs/wolfssl/Makefile to include --enable-opensslextra -# NOTE: it will compile without it, untested whether it it's needed?! - 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 +ifeq ($(BUILD_VARIANT),mbedtls) + CMAKE_OPTIONS += -DLWS_WITH_MBEDTLS=1 endif ifeq ($(BUILD_VARIANT),full) @@ -102,10 +96,10 @@ define Package/libwebsockets/install $(CP) $(PKG_INSTALL_DIR)/usr/lib/libwebsockets.so* $(1)/usr/lib/ endef -Package/libwebsockets-wolfssl/install = $(Package/libwebsockets/install) +Package/libwebsockets-mbedtls/install = $(Package/libwebsockets/install) Package/libwebsockets-openssl/install = $(Package/libwebsockets/install) Package/libwebsockets-full/install = $(Package/libwebsockets/install) $(eval $(call BuildPackage,libwebsockets-openssl)) -$(eval $(call BuildPackage,libwebsockets-wolfssl)) +$(eval $(call BuildPackage,libwebsockets-mbedtls)) $(eval $(call BuildPackage,libwebsockets-full)) |