Skip to contentSkip to conversation

libuwsc: new package

PATCH New Jianhui zhao 2 participants 2 messages Sep 14, 2019 – Mar 29, 2020

lore
Share & tools
lore
#0 lore raw

PATCH v5 1/1 libuwsc: new package

From: Jianhui Zhao <[email protected]>

--
Changes v4 -> v5:
- Fix newline damaged (suggested by Baruch Siach)

---
 package/Config.in            |  1 +
 package/libuwsc/Config.in    |  8 ++++++++
 package/libuwsc/libuwsc.hash |  3 +++
 package/libuwsc/libuwsc.mk   | 37 ++++++++++++++++++++++++++++++++++++
 4 files changed, 49 insertions(+)
 create mode 100644 package/libuwsc/Config.in
 create mode 100644 package/libuwsc/libuwsc.hash
 create mode 100644 package/libuwsc/libuwsc.mk
package/Config.in +1 -0
index 7d915ea4d7..ecf1b8e71a 100644
@@ -1625,6 +1625,7 @@ menu "Networking"
 	source "package/libupnp18/Config.in"
 	source "package/libupnpp/Config.in"
 	source "package/liburiparser/Config.in"
+	source "package/libuwsc/Config.in"
 	source "package/libvncserver/Config.in"
 	source "package/libwebsock/Config.in"
 	source "package/libwebsockets/Config.in"
package/libuwsc/Config.in new file +8 -0
new file mode 100644
index 0000000000..ae99b6d2dc
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_LIBUWSC
+	bool "libuwsc"
+	select BR2_PACKAGE_LIBEV
+	help
+	  A Lightweight and fully asynchronous WebSocket client
+	  library based on libev.
+
+	  https://github.com/zhaojh329/libuwsc
package/libuwsc/libuwsc.hash new file +3 -0
new file mode 100644
index 0000000000..f137b3613b
@@ -0,0 +1,3 @@
+# Locally calculated
+sha256 bae2cd13eda86876ebcf99a38a069f5e8c01717713d2fec25031051b9c47624b  libuwsc-3.3.2.tar.gz
+sha256 e557975decde6439395e72dce7690d974d1a493722a7be5228794ec944f0c5db  LICENSE
package/libuwsc/libuwsc.mk new file +37 -0
new file mode 100644
index 0000000000..5afbb186a4
@@ -0,0 +1,37 @@
+################################################################################
+#
+# libuwsc
+#
+################################################################################
+
+LIBUWSC_VERSION = 3.3.2
+LIBUWSC_SITE = https://github.com/zhaojh329/libuwsc/releases/download/v$(LIBUWSC_VERSION)
+LIBUWSC_LICENSE = MIT
+LIBUWSC_LICENSE_FILES = LICENSE
+LIBUWSC_INSTALL_STAGING = YES
+LIBUWSC_DEPENDENCIES = libev
+
+ifeq ($(BR2_PACKAGE_OPENSSL),y)
+LIBUWSC_DEPENDENCIES += openssl
+LIBUWSC_CONF_OPTS += -DUWSC_USE_OPENSSL=ON
+else ifeq ($(BR2_PACKAGE_WOLFSSL),y)
+LIBUWSC_DEPENDENCIES += wolfssl
+LIBUWSC_CONF_OPTS += -DUWSC_USE_WOLFSSL=ON
+else ifeq ($(BR2_PACKAGE_MBEDTLS),y)
+LIBUWSC_DEPENDENCIES += mbedtls
+LIBUWSC_CONF_OPTS += -DUWSC_USE_MBEDTLS=ON
+else
+LIBUWSC_CONF_OPTS += -DUWSC_SSL_SUPPORT=OFF
+endif
+
+ifeq ($(BR2_PACKAGE_LUA),y)
+LIBUWSC_DEPENDENCIES += lua
+ifeq ($(BR2_PACKAGE_HAS_LUAINTERPRETER),y)
+LIBUWSC_DEPENDENCIES += luainterpreter
+endif
+LIBUWSC_CONF_OPTS += -DUWSC_LUA_SUPPORT=ON
+else
+LIBUWSC_CONF_OPTS += -DUWSC_LUA_SUPPORT=OFF
+endif
+
+$(eval $(cmake-package))
Signature · 1 line
2.17.1
#1 lore raw

PATCH v5 1/1 libuwsc: new package

Hello,

Quoted 3 lines · On Sun, 15 Sep 2019 00:23:02 +0800 Jianhui zhao <[email protected]> wrote:

From: Jianhui Zhao <[email protected]>

I've applied the patch, after doing a number of changes, see below.

Quoted 5 lines
 package/Config.in            |  1 +
 package/libuwsc/Config.in    |  8 ++++++++
 package/libuwsc/libuwsc.hash |  3 +++
 package/libuwsc/libuwsc.mk   | 37 ++++++++++++++++++++++++++++++++++++
 4 files changed, 49 insertions(+)

I've added an entry to the DEVELOPERS file.

Quoted 20 lines

new file mode 100644
index 0000000000..5afbb186a4

package/libuwsc/libuwsc.mk new file +15 -0
@@ -0,0 +1,37 @@
+################################################################################
+#
+# libuwsc
+#
+################################################################################
+
+LIBUWSC_VERSION = 3.3.2
+LIBUWSC_SITE = https://github.com/zhaojh329/libuwsc/releases/download/v$(LIBUWSC_VERSION)
+LIBUWSC_LICENSE = MIT
+LIBUWSC_LICENSE_FILES = LICENSE
+LIBUWSC_INSTALL_STAGING = YES
+LIBUWSC_DEPENDENCIES = libev
+
+ifeq ($(BR2_PACKAGE_OPENSSL),y)
+LIBUWSC_DEPENDENCIES += openssl

package/libuwsc/libuwsc.mk line 25

Quoted 10 lines
package/libuwsc/libuwsc.mk new file +10 -0
+LIBUWSC_CONF_OPTS += -DUWSC_USE_OPENSSL=ON
+else ifeq ($(BR2_PACKAGE_WOLFSSL),y)
+LIBUWSC_DEPENDENCIES += wolfssl
+LIBUWSC_CONF_OPTS += -DUWSC_USE_WOLFSSL=ON
+else ifeq ($(BR2_PACKAGE_MBEDTLS),y)
+LIBUWSC_DEPENDENCIES += mbedtls
+LIBUWSC_CONF_OPTS += -DUWSC_USE_MBEDTLS=ON
+else
+LIBUWSC_CONF_OPTS += -DUWSC_SSL_SUPPORT=OFF
+endif

Just like for rtty, I've added some explicit disabling of SSL options when they are not relevant.

package/libuwsc/libuwsc.mk line 30

Quoted 5 lines
package/libuwsc/libuwsc.mk new file +5 -0
+
+ifeq ($(BR2_PACKAGE_LUA),y)
+LIBUWSC_DEPENDENCIES += lua
+ifeq ($(BR2_PACKAGE_HAS_LUAINTERPRETER),y)
+LIBUWSC_DEPENDENCIES += luainterpreter

This is not good: you should either use BR2_PACKAGE_LUA, or BR2_PACKAGE_HJAS_LUAINTERPRETER, but not both.

You must use BR2_PACKAGE_LUA when you only support the original Lua interpreter. Or use BR2_PACKAGE_HJAS_LUAINTERPRETER when you support either Lua or LuaJIT. From a quick test build, LuaJIT was not properly detected, so I've simplified that to only use BR2_PACKAGE_LUA.

Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com