diff mbox series

[v5,1/1] libuwsc: new package

Message ID 20190914162302.4645-1-zhaojh329@gmail.com
State Accepted
Headers show
Series [v5,1/1] libuwsc: new package | expand

Commit Message

Jianhui Zhao Sept. 14, 2019, 4:23 p.m. UTC
From: Jianhui Zhao <zhaojh329@gmail.com>

Signed-off-by: Jianhui zhao <zhaojh329@gmail.com>

--
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

Comments

Thomas Petazzoni March 29, 2020, 9:27 p.m. UTC | #1
Hello,

On Sun, 15 Sep 2019 00:23:02 +0800
Jianhui zhao <zhaojh329@gmail.com> wrote:

> From: Jianhui Zhao <zhaojh329@gmail.com>
> 
> Signed-off-by: Jianhui zhao <zhaojh329@gmail.com>

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

>  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.

> new file mode 100644
> index 0000000000..5afbb186a4
> --- /dev/null
> +++ b/package/libuwsc/libuwsc.mk
> @@ -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

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

> +
> +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
diff mbox series

Patch

diff --git a/package/Config.in b/package/Config.in
index 7d915ea4d7..ecf1b8e71a 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -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"
diff --git a/package/libuwsc/Config.in b/package/libuwsc/Config.in
new file mode 100644
index 0000000000..ae99b6d2dc
--- /dev/null
+++ b/package/libuwsc/Config.in
@@ -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
diff --git a/package/libuwsc/libuwsc.hash b/package/libuwsc/libuwsc.hash
new file mode 100644
index 0000000000..f137b3613b
--- /dev/null
+++ b/package/libuwsc/libuwsc.hash
@@ -0,0 +1,3 @@ 
+# Locally calculated
+sha256 bae2cd13eda86876ebcf99a38a069f5e8c01717713d2fec25031051b9c47624b  libuwsc-3.3.2.tar.gz
+sha256 e557975decde6439395e72dce7690d974d1a493722a7be5228794ec944f0c5db  LICENSE
diff --git a/package/libuwsc/libuwsc.mk b/package/libuwsc/libuwsc.mk
new file mode 100644
index 0000000000..5afbb186a4
--- /dev/null
+++ b/package/libuwsc/libuwsc.mk
@@ -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))