mirror of
https://gitlab.com/buildroot.org/buildroot.git
synced 2026-09-10 08:14:09 -09:00
package/libuwsc: remove package
Fails to build with cmake 4. The package is a library without any reverse dependencies and no active development since 2021. Fixes: https://autobuild.buildroot.net/results/f6b/f6b0c136703e0cf38c052e6a6a3ef91cdcb797a0/ Signed-off-by: Bernd Kuhls <bernd@kuhls.net> Cc: Jianhui Zhao <zhaojh329@gmail.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
Bernd Kuhls
committed by
Thomas Petazzoni
Thomas Petazzoni
parent
fbbaf33179
commit
554ba0d95e
@@ -146,6 +146,12 @@ endif
|
||||
|
||||
comment "Legacy options removed in 2026.02"
|
||||
|
||||
config BR2_PACKAGE_LIBUWSC
|
||||
bool "libuwsc has been removed"
|
||||
select BR2_LEGACY
|
||||
help
|
||||
libuwsc is unmaintained and has been removed
|
||||
|
||||
config BR2_PACKAGE_LIBIQRF
|
||||
bool "libiqrf has been removed"
|
||||
select BR2_LEGACY
|
||||
|
||||
@@ -1633,7 +1633,6 @@ F: package/qt6/
|
||||
|
||||
N: Jianhui Zhao <zhaojh329@gmail.com>
|
||||
F: package/libuhttpd/
|
||||
F: package/libuwsc/
|
||||
F: package/rtty/
|
||||
|
||||
N: Jiaxun Yang <jiaxun.yang@flygoat.com>
|
||||
|
||||
@@ -2097,7 +2097,6 @@ menu "Networking"
|
||||
source "package/libupnpp/Config.in"
|
||||
source "package/liburiparser/Config.in"
|
||||
source "package/libutp/Config.in"
|
||||
source "package/libuwsc/Config.in"
|
||||
source "package/libvncserver/Config.in"
|
||||
source "package/libwebsockets/Config.in"
|
||||
source "package/libyang/Config.in"
|
||||
|
||||
@@ -1,34 +0,0 @@
|
||||
From bb71b21eb9407479ad729b3c858b0fc350fae335 Mon Sep 17 00:00:00 2001
|
||||
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
Date: Sun, 21 Feb 2021 19:39:59 +0100
|
||||
Subject: [PATCH] CMakeLists.txt: add BUILD_EXAMPLE
|
||||
|
||||
Allow the user to disable example
|
||||
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
Upstream: https://github.com/zhaojh329/libuwsc/commit/bb71b21eb9407479ad729b3c858b0fc350fae335
|
||||
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
|
||||
---
|
||||
CMakeLists.txt | 6 +++++-
|
||||
1 file changed, 5 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 110d933..c52ab79 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -2,7 +2,11 @@ cmake_minimum_required(VERSION 2.8)
|
||||
|
||||
project(libuwsc C)
|
||||
|
||||
+option(BUILD_EXAMPLE "Build example" ON)
|
||||
+
|
||||
list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/Modules/")
|
||||
|
||||
add_subdirectory(src)
|
||||
-add_subdirectory(example)
|
||||
+if(BUILD_EXAMPLE)
|
||||
+ add_subdirectory(example)
|
||||
+endif()
|
||||
--
|
||||
2.25.1
|
||||
|
||||
@@ -1,26 +0,0 @@
|
||||
From 8cb416140741a596235b8acc46b2b119b13ebfab Mon Sep 17 00:00:00 2001
|
||||
From: Rosen Penev <rosenp@gmail.com>
|
||||
Date: Tue, 6 Jul 2021 21:01:52 -0700
|
||||
Subject: [PATCH] fix bad indentation
|
||||
|
||||
Fixes error with GCC11.
|
||||
|
||||
Upstream: https://github.com/zhaojh329/libuwsc/commit/8cb416140741a596235b8acc46b2b119b13ebfab
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
---
|
||||
src/lua/uwsc_lua.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/lua/uwsc_lua.c b/src/lua/uwsc_lua.c
|
||||
index de6932e..84689fe 100644
|
||||
--- a/src/lua/uwsc_lua.c
|
||||
+++ b/src/lua/uwsc_lua.c
|
||||
@@ -178,7 +178,7 @@ static int uwsc_lua_on(lua_State *L)
|
||||
else
|
||||
luaL_argcheck(L, false, 2, "available event name: open message error close");
|
||||
|
||||
- return 0;
|
||||
+ return 0;
|
||||
}
|
||||
|
||||
static int __uwsc_lua_send(lua_State *L, int op)
|
||||
@@ -1,37 +0,0 @@
|
||||
From 1c3579e99163a13d622c3ef44088c23d5eea306d Mon Sep 17 00:00:00 2001
|
||||
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
Date: Sun, 14 Jan 2024 16:44:13 +0100
|
||||
Subject: [PATCH] src/ssl.c: fix wolfssl build
|
||||
|
||||
wolfssl/options.h must also be included by clients to avoid the
|
||||
following build failure because OPENSSL_ALL won't be defined:
|
||||
|
||||
/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;
|
||||
| ^~~~~~~
|
||||
|
||||
Fixes:
|
||||
- http://autobuild.buildroot.org/results/edc49cce5b1f456d980841f4c315e7cd784b1561
|
||||
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
Upstream: N/A (already fixed by
|
||||
https://github.com/zhaojh329/ssl/commit/c40ebcd7b4277321acbbd4b00b4b10fd363c7a97)
|
||||
---
|
||||
src/ssl.c | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/src/ssl.c b/src/ssl.c
|
||||
index 3640022..6a3d250 100644
|
||||
--- a/src/ssl.c
|
||||
+++ b/src/ssl.c
|
||||
@@ -54,6 +54,7 @@ struct uwsc_ssl_ctx {
|
||||
#include <openssl/err.h>
|
||||
#elif UWSC_HAVE_WOLFSSL
|
||||
#define WC_NO_HARDEN
|
||||
+#include <wolfssl/options.h>
|
||||
#include <wolfssl/openssl/ssl.h>
|
||||
#include <wolfssl/openssl/err.h>
|
||||
#endif
|
||||
--
|
||||
2.43.0
|
||||
|
||||
@@ -1,8 +0,0 @@
|
||||
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
|
||||
@@ -1,3 +0,0 @@
|
||||
# Locally calculated
|
||||
sha256 a06b7324671e181ffe3165e93e6f94c7ac1380f69e32a52e80c8da7016acd60d libuwsc-3.3.5.tar.gz
|
||||
sha256 99efed4bbc0b62f96f999ef23399e38234fb91651af734fd389a52b033a85b55 LICENSE
|
||||
@@ -1,53 +0,0 @@
|
||||
################################################################################
|
||||
#
|
||||
# libuwsc
|
||||
#
|
||||
################################################################################
|
||||
|
||||
LIBUWSC_VERSION = 3.3.5
|
||||
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_SSL_SUPPORT=ON \
|
||||
-DUWSC_USE_MBEDTLS=OFF \
|
||||
-DUWSC_USE_OPENSSL=ON \
|
||||
-DUWSC_USE_WOLFSSL=OFF
|
||||
else ifeq ($(BR2_PACKAGE_WOLFSSL_ALL),y)
|
||||
LIBUWSC_DEPENDENCIES += wolfssl
|
||||
LIBUWSC_CONF_OPTS += \
|
||||
-DUWSC_SSL_SUPPORT=ON \
|
||||
-DUWSC_USE_MBEDTLS=OFF \
|
||||
-DUWSC_USE_OPENSSL=OFF \
|
||||
-DUWSC_USE_WOLFSSL=ON
|
||||
else ifeq ($(BR2_PACKAGE_MBEDTLS),y)
|
||||
LIBUWSC_DEPENDENCIES += mbedtls
|
||||
LIBUWSC_CONF_OPTS += \
|
||||
-DUWSC_SSL_SUPPORT=ON \
|
||||
-DUWSC_USE_MBEDTLS=ON \
|
||||
-DUWSC_USE_OPENSSL=OFF \
|
||||
-DUWSC_USE_WOLFSSL=OFF
|
||||
else
|
||||
LIBUWSC_CONF_OPTS += -DUWSC_SSL_SUPPORT=OFF
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LUA):$(BR2_STATIC_LIBS),y:)
|
||||
LIBUWSC_DEPENDENCIES += lua
|
||||
LIBUWSC_CONF_OPTS += -DUWSC_LUA_SUPPORT=ON
|
||||
else
|
||||
LIBUWSC_CONF_OPTS += -DUWSC_LUA_SUPPORT=OFF
|
||||
endif
|
||||
|
||||
# BUILD_SHARED_LIBS is handled in pkg-cmake.mk as it is a generic cmake variable
|
||||
ifeq ($(BR2_SHARED_STATIC_LIBS),y)
|
||||
LIBUWSC_CONF_OPTS += -DBUILD_STATIC_LIBS=ON
|
||||
else ifeq ($(BR2_SHARED_LIBS),y)
|
||||
LIBUWSC_CONF_OPTS += -DBUILD_STATIC_LIBS=OFF
|
||||
endif
|
||||
|
||||
$(eval $(cmake-package))
|
||||
Reference in New Issue
Block a user