Commit Graph

9 Commits

Author SHA1 Message Date
Fabrice Fontaine
e874fd08e0 package/libuwsc: fix wolfssl build
Commit 1567fbd72d didn't fully fix the
wolfssl build failure because the include on wolfssl/options.h was still
missing:

/home/autobuild/autobuild/instance-6/output-1/build/libuwsc-3.3.5/src/ssl.c:62:5: error: unknown type name 'SSL_CTX'
   62 |     SSL_CTX *ctx;
      |     ^~~~~~~

While at it, add upstream tag to patches

Fixes:
 - http://autobuild.buildroot.org/results/edc49cce5b1f456d980841f4c315e7cd784b1561

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2024-01-15 08:46:17 +01:00
Fabrice Fontaine
1567fbd72d package/libuwsc: fix wolfssl build
libuwsc needs BR2_PACKAGE_WOLFSSL_ALL (which enables openssl compat
layer) to avoid the following wolfssl build failure raised since the
addition of the package in commit
120c04775d:

/home/br-user/work/instance-1/output-1/build/libuwsc-3.3.5/src/ssl.c:62:5: error: unknown type name 'SSL_CTX'
   62 |     SSL_CTX *ctx;
      |     ^~~~~~~

Note that we do not select _ALL when wolfssl is enabled, because wolfssl
is neither the only nor the preferred choice, so the condition would
have to be a bit more complex:

    select BR2_PACKAGE_WOLFSSL_ALL if BR2_PACKAGE_WOLFSSL \
        && !BR2_STATIC_LIBS && !BR2_PACKAGE_OPENSSL

It is not overly complicated, but it is no longer trivial or obvious,
and would easily break if the ordering of preferences were to change in
the .mk fie in the future.

Fixes:
 - http://autobuild.buildroot.org/results/6c2a6ed6fca1f92aab299f6ed9cd900b20e8d512

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
[yann.morin.1998@free.fr: explain why we don't select _ALL]
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
2022-12-10 09:37:40 +01:00
Fabrice Fontaine
2b5dc4e32e package/libuwsc: fix build with gcc 11
Fix the following build failure with gcc 11:

/tmp/instance-1/output-1/build/libuwsc-3.3.5/src/lua/uwsc_lua.c: In function 'uwsc_lua_on':
/tmp/instance-1/output-1/build/libuwsc-3.3.5/src/lua/uwsc_lua.c:177:5: error: this 'else' clause does not guard... [-Werror=misleading-indentation]
  177 |     else
      |     ^~~~
/tmp/instance-1/output-1/build/libuwsc-3.3.5/src/lua/uwsc_lua.c:180:9: note: ...this statement, but the latter is misleadingly indented as if it were guarded by the 'else'
  180 |         return 0;
      |         ^~~~~~

Fixes:
 - http://autobuild.buildroot.org/results/1b031667e6d184493ea55ea6630272af4e475375

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
2021-08-04 23:18:08 +02:00
Fabrice Fontaine
1b3c8ce97f package/libuwsc: disable example
BUILD_EXAMPLE=OFF is already passed by cmake-package

Fixes:
 - http://autobuild.buildroot.org/results/f5256d5a3a86112f008506f1910d0600c491a2a0

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
2021-02-25 22:47:05 +01:00
Fabrice Fontaine
bfd8d7be71 package/libuwsc: manage BUILD_STATIC_LIBS
Use BUILD_STATIC_LIBS added in version 3.3.5 with
1759dfd7d9

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
2020-04-20 07:46:14 +02:00
Fabrice Fontaine
d4aa39cb63 package/libuwsc: lua needs dynamic library
lua is built as a module so it needs dynamic library

Fixes:
 - http://autobuild.buildroot.org/results/fe511be44e8546b58c97dc956c07f5a45e0fc3c9

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
2020-04-20 07:46:09 +02:00
Jianhui Zhao
dddd3a9bce package/libuwsc: bump version to 3.3.5
Signed-off-by: Jianhui Zhao <zhaojh329@gmail.com>
[yann.morin.1998@free.fr: two spaces in hash file]
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
2020-04-07 07:41:45 +02:00
Jianhui Zhao
964fb4bf82 package/libuwsc: bump version to 3.3.4
Adjust license hash for a change in email address:
-Copyright (c) 2019 Jianhui Zhao <jianhuizhao329@gmail.com>
+Copyright (c) 2019 Jianhui Zhao <zhaojh329@gmail.com>

Signed-off-by: Jianhui Zhao <zhaojh329@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2020-04-02 22:01:12 +02:00
Jianhui Zhao
120c04775d package/libuwsc: new package
Signed-off-by: Jianhui zhao <zhaojh329@gmail.com>
[Thomas:
 - add entry in DEVELOPERS file
 - be more explicit with SSL options
 - drop logic around luainterpreter since luajit is not properly
   detected]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
2020-03-29 23:18:26 +02:00