diff options
| author | Karl Palsson <karlp@etactica.com> | 2020-05-14 11:13:33 +0000 |
|---|---|---|
| committer | Karl Palsson <karlp@etactica.com> | 2021-03-15 16:05:58 +0000 |
| commit | 544c7b22b6d571ce5f654594400aa47a91ae890a (patch) | |
| tree | 19420c81a463d464dd2b18f2e899592571babfa2 /libs | |
| parent | 7f0920110db0cf08e27238092677f96c3adde07d (diff) | |
libwebsockets: update to 4.1.6
This is a major version bump, from 3.x to 4.x, and continues the path
towards a mail client.
New features:
* ntp client
* dns resolver
* mqtt client
* number humanizing string helpers
License change upstream.
cmake options tweaked to match current upstream defaults again.
Tested with mosquitto and ttyd.
Signed-off-by: Karl Palsson <karlp@etactica.com>
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/libwebsockets/Makefile | 31 | ||||
| -rw-r--r-- | libs/libwebsockets/patches/020-fix-travis.patch | 14 |
2 files changed, 17 insertions, 28 deletions
diff --git a/libs/libwebsockets/Makefile b/libs/libwebsockets/Makefile index b71759b04..365e54128 100644 --- a/libs/libwebsockets/Makefile +++ b/libs/libwebsockets/Makefile @@ -8,17 +8,17 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libwebsockets -PKG_VERSION:=3.1.0 -PKG_RELEASE:=2 +PKG_VERSION:=4.1.6 +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:=db948be74c78fc13f1f1a55e76707d7baae3a1c8f62b625f639e8f2736298324 +PKG_HASH:=402e9a8df553c9cd2aff5d7a9758e9e5285bf3070c82539082864633db3deb83 PKG_SOURCE_VERSION:=v$(PKG_VERSION) -PKG_LICENSE:=LGPL-2.1+exception +PKG_LICENSE:=MIT PKG_LICENSE_FILES:=LICENSE CMAKE_INSTALL:=1 @@ -27,14 +27,15 @@ include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/cmake.mk CMAKE_OPTIONS += -DLWS_IPV6=$(if $(CONFIG_IPV6),ON,OFF) -CMAKE_OPTIONS += -DLWS_WITHOUT_TESTAPPS=ON - -# other options worth noting -# CMAKE_OPTIONS += -DLWS_WITHOUT_EXTENSIONS=ON -# CMAKE_OPTIONS += -DLWS_WITHOUT_DAEMONIZE=ON -# CMAKE_OPTIONS += -DLWS_WITHOUT_SERVER=ON -# CMAKE_OPTIONS += -DLWS_WITHOUT_DEBUG=ON +CMAKE_OPTIONS += -DISABLE_WERROR=ON +CMAKE_OPTIONS += -DCMAKE_BUILD_TYPE=Release +# turn off all test apps +CMAKE_OPTIONS += -DLWS_WITHOUT_TESTAPPS=ON +CMAKE_OPTIONS += -DLWS_WITHOUT_TEST_SERVER=ON +CMAKE_OPTIONS += -DLWS_WITHOUT_TEST_SERVER_EXTPOLL=ON +CMAKE_OPTIONS += -DLWS_WITHOUT_TEST_PING=ON +CMAKE_OPTIONS += -DLWS_WITHOUT_TEST_CLIENT=ON define Package/libwebsockets/Default SECTION:=libs @@ -69,7 +70,6 @@ endef ifeq ($(BUILD_VARIANT),openssl) CMAKE_OPTIONS += -DLWS_OPENSSL_CLIENT_CERTS=/etc/ssl/certs - CMAKE_OPTIONS += -DLWS_OPENSSL_SUPPORT=ON CMAKE_OPTIONS += -DLWS_WITH_SSL=ON endif @@ -79,7 +79,6 @@ endif ifeq ($(BUILD_VARIANT),full) CMAKE_OPTIONS += -DLWS_OPENSSL_CLIENT_CERTS=/etc/ssl/certs - CMAKE_OPTIONS += -DLWS_OPENSSL_SUPPORT=ON CMAKE_OPTIONS += -DLWS_WITH_SSL=ON CMAKE_OPTIONS += -DLWS_WITH_LIBUV=ON CMAKE_OPTIONS += -DLWS_WITH_PLUGINS=ON @@ -96,7 +95,11 @@ endef Package/libwebsockets-mbedtls/install = $(Package/libwebsockets/install) Package/libwebsockets-openssl/install = $(Package/libwebsockets/install) -Package/libwebsockets-full/install = $(Package/libwebsockets/install) + +define Package/libwebsockets-full/install + $(call Package/libwebsockets/install,$(1)) + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libwebsockets-evlib_uv.so* $(1)/usr/lib +endef $(eval $(call BuildPackage,libwebsockets-openssl)) $(eval $(call BuildPackage,libwebsockets-mbedtls)) diff --git a/libs/libwebsockets/patches/020-fix-travis.patch b/libs/libwebsockets/patches/020-fix-travis.patch deleted file mode 100644 index 85b165f75..000000000 --- a/libs/libwebsockets/patches/020-fix-travis.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1233,9 +1233,9 @@ if (CMAKE_COMPILER_IS_GNUCC OR CMAKE_COM - endif() - - if (UNIX AND NOT LWS_WITH_ESP32) -- set(CMAKE_C_FLAGS "-Wall -Wsign-compare -Wignored-qualifiers -Wtype-limits -Wuninitialized -Werror ${VISIBILITY_FLAG} -Wundef ${GCOV_FLAGS} ${CMAKE_C_FLAGS} ${ASAN_FLAGS}" ) -+ set(CMAKE_C_FLAGS "-Wall -Wsign-compare -Wignored-qualifiers -Wtype-limits -Wuninitialized ${VISIBILITY_FLAG} -Wundef ${GCOV_FLAGS} ${CMAKE_C_FLAGS} ${ASAN_FLAGS}" ) - else() -- set(CMAKE_C_FLAGS "-Wall -Wsign-compare -Wignored-qualifiers -Wtype-limits -Wuninitialized -Werror ${VISIBILITY_FLAG} ${GCOV_FLAGS} ${CMAKE_C_FLAGS}" ) -+ set(CMAKE_C_FLAGS "-Wall -Wsign-compare -Wignored-qualifiers -Wtype-limits -Wuninitialized ${VISIBILITY_FLAG} ${GCOV_FLAGS} ${CMAKE_C_FLAGS}" ) - endif() - endif () - |