NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

package/libmicrohttpd: remove dependency on threads

Browse Source 
Upstream added support for non-threaded builds:
https://git.gnunet.org/libmicrohttpd.git/commit/configure.ac?id=0eefd20ba370509d93fb7b0220e6d1c5739efac5

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
Bernd Kuhls 2020-03-27 19:50:45 +01:00 committed by Thomas Petazzoni
parent 80ae1aedcb
commit 80f3622bc7
4 changed files with 52 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
package/janus-gateway/Config.in
View File

@ -77,7 +77,6 @@ comment "RabbitMQ transport needs a toolchain w/ dynamic library, threads"
config BR2_PACKAGE_JANUS_GATEWAY_REST
bool "REST (HTTP/HTTPS)"
depends on BR2_TOOLCHAIN_HAS_THREADS
select BR2_PACKAGE_LIBMICROHTTPD
comment "REST transport needs a toolchain w/ threads"

46
package/libmicrohttpd/0001-fix-6135.patch Normal file
View File

@ -0,0 +1,46 @@
From 6702e6202368720d7a381669c03eedc318f225ca Mon Sep 17 00:00:00 2001
From: Christian Grothoff <christian@grothoff.org>
Date: Thu, 26 Mar 2020 19:08:30 +0100
Subject: [PATCH] fix #6135
Downloaded from upstream commit to fix non-threaded build:
https://git.gnunet.org/libmicrohttpd.git/commit/?id=6702e6202368720d7a381669c03eedc318f225ca
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
src/microhttpd/internal.h | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/microhttpd/internal.h b/src/microhttpd/internal.h
index 211eed9f..ad16535e 100644
--- a/src/microhttpd/internal.h
+++ b/src/microhttpd/internal.h
@@ -1462,12 +1462,6 @@ struct MHD_Daemon
*/
size_t thread_stack_size;
- /**
- * Our #MHD_OPTION_SERVER_INSANITY level, bits indicating
- * which sanity checks are off.
- */
- enum MHD_DisableSanityCheck insanity_level;
-
/**
* Number of worker daemons
*/
@@ -1490,6 +1484,12 @@ struct MHD_Daemon
MHD_mutex_ cleanup_connection_mutex;
#endif
+ /**
+ * Our #MHD_OPTION_SERVER_INSANITY level, bits indicating
+ * which sanity checks are off.
+ */
+ enum MHD_DisableSanityCheck insanity_level;
+
/**
* Listen socket.
*/
--
2.25.0

4
package/libmicrohttpd/Config.in
View File

@ -1,6 +1,5 @@
config BR2_PACKAGE_LIBMICROHTTPD
bool "libmicrohttpd"
depends on BR2_TOOLCHAIN_HAS_THREADS
help
GNU libmicrohttpd is a small C library that makes it easy to
run an HTTP server as part of another application.
@ -21,6 +20,3 @@ comment "libmicrohttpd https support needs a toolchain w/ wchar, dynamic library
depends on !BR2_USE_WCHAR || BR2_STATIC_LIBS
endif
comment "libmicrohttpd needs a toolchain w/ threads"
depends on !BR2_TOOLCHAIN_HAS_THREADS

6
package/libmicrohttpd/libmicrohttpd.mk
View File

@ -22,4 +22,10 @@ LIBMICROHTTPD_LICENSE = LGPL-2.1+ or eCos
LIBMICROHTTPD_CONF_OPTS += --disable-https
endif
ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y)
LIBMICROHTTPD_CONF_OPTS += --with-threads=auto
else
LIBMICROHTTPD_CONF_OPTS += --with-threads=none
endif
$(eval $(autotools-package))