[Buildroot] [PATCH 1/1] libuwsc: new package

[Baruch Siach]

Hi Jianhui Zhao,

Thanks for sending this revised patch.

When you send a new revision of a patch it would be nice to add the
patch revision number in the subject. You can use the -v option of git
format-patch/send-email commands for that. For the second revision you
could do:

  git format-patch -v2 ...

On Tue, Sep 03 2019, 赵建辉 wrote:
> Signed-off-by: 赵建辉 <zhaojh329 at gmail.com>
> ---

In addition, you should add a summary of changes in this patch revision
below the '---' separator.

See section 21.5.4 in the Buildroot manual for more details.

  https://buildroot.org/downloads/manual/manual.html#submitting-patches

>  package/Config.in            |  1 +
>  package/libuwsc/Config.in    | 39 +++++++++++++++++++++++++++++++++
>  package/libuwsc/libuwsc.hash |  3 +++
>  package/libuwsc/libuwsc.mk   | 42 ++++++++++++++++++++++++++++++++++++
>  4 files changed, 85 insertions(+)
>  create mode 100644 package/libuwsc/Config.in
>  create mode 100644 package/libuwsc/libuwsc.hash
>  create mode 100644 package/libuwsc/libuwsc.mk
>
> diff --git a/package/Config.in b/package/Config.in
> index 710ed12be0..d1ea644cd2 100644
> --- a/package/Config.in
> +++ b/package/Config.in
> @@ -1622,6 +1622,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..51a9acf8b1
> --- /dev/null
> +++ b/package/libuwsc/Config.in
> @@ -0,0 +1,39 @@
> +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
> +
> +if BR2_PACKAGE_LIBUWSC
> +
> +config BR2_PACKAGE_LIBUWSC_TLS_SUPPORT
> +       bool
> +       default y if BR2_PACKAGE_OPENSSL
> +       default y if BR2_PACKAGE_WOLFSSL
> +       default y if BR2_PACKAGE_MBEDTLS

We usually don't add config options for optional dependencies. So this
entire 'if' block should be removed. See more below.

> +
> +choice
> +       prompt "SSL/TLS library to use"
> +       depends on BR2_PACKAGE_LIBUWSC_TLS_SUPPORT
> +
> +config BR2_PACKAGE_LIBUWSC_OPENSSL
> +       bool "OpenSSL"
> +       depends on BR2_PACKAGE_OPENSSL
> +
> +config BR2_PACKAGE_LIBUWSC_WOLFSSL
> +       bool "wolfssl"
> +       depends on BR2_PACKAGE_WOLFSSL
> +
> +config BR2_PACKAGE_LIBUWSC_MBEDTLS
> +       bool "mbedtls"
> +       depends on BR2_PACKAGE_MBEDTLS
> +
> +endchoice
> +
> +comment "A TLS library is needed for SSL/TLS support"
> +       depends on !BR2_PACKAGE_LIBUWSC_TLS_SUPPORT
> +
> +endif
> 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..31fddc648f
> --- /dev/null
> +++ b/package/libuwsc/libuwsc.mk
> @@ -0,0 +1,42 @@
> +################################################################################
> +#
> +# 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_LIBUWSC_OPENSSL),y)
> +LIBUWSC_DEPENDENCIES += openssl
> +LIBUWSC_CONF_OPTS += -DUWSC_USE_OPENSSL=ON
> +else
> +LIBUWSC_CONF_OPTS += -DUWSC_USE_OPENSSL=OFF
> +endif
> +
> +ifeq ($(BR2_PACKAGE_LIBUWSC_WOLFSSL),y)
> +LIBUWSC_DEPENDENCIES += wolfssl
> +LIBUWSC_CONF_OPTS += -DUWSC_USE_WOLFSSL=ON
> +else
> +LIBUWSC_CONF_OPTS += -DUWSC_USE_WOLFSSL=OFF
> +endif
> +
> +ifeq ($(BR2_PACKAGE_LIBUWSC_MBEDTLS),y)
> +LIBUWSC_DEPENDENCIES += mbedtls
> +LIBUWSC_CONF_OPTS += -DUWSC_USE_MBEDTLS=ON
> +else
> +LIBUWSC_CONF_OPTS += -DUWSC_USE_MBEDTLS=OFF
> +endif

Instead of that we usually test if the dependency package itself is
enabled. Something like this:

ifeq ($(BR2_PACKAGE_OPENSSL),y)
...
else ifeq ($(BR2_PACKAGE_WOLFSSL),y)
...
else ifeq ($(BR2_PACKAGE_MBEDTLS),y)
...
endif

> +
> +ifeq ($(BR2_USE_MMU)$(BR2_PACKAGE_LUA_5_2),yy)

BR2_PACKAGE_LUA_5_2 has been removed in release 2019.02. Does lua
binding work with lua 5.3?

> +LIBUWSC_DEPENDENCIES += lua
> +LIBUWSC_CONF_OPTS += -DUWSC_LUA_SUPPORT=ON
> +else
> +LIBUWSC_CONF_OPTS += -DUWSC_LUA_SUPPORT=OFF
> +endif
> +
> +$(eval $(cmake-package))

baruch

-- 
     http://baruch.siach.name/blog/                  ~. .~   Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
   - baruch at tkos.co.il - tel: +972.52.368.4656, http://www.tkos.co.il -