Skip to contentSkip to conversation

package/libmicrohttpd: remove dependency on threads

PATCH New Bernd Kuhls 2 participants 2 messages Mar 27, 2020 – Mar 29, 2020

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 package/libmicrohttpd: remove dependency on threads

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

---
v2: removed _REENTRANT hack (Thomas)
updated patch

 package/janus-gateway/Config.in           |  1 -
 package/libmicrohttpd/0001-fix-6135.patch | 46 +++++++++++++++++++++++
 package/libmicrohttpd/Config.in           |  4 --
 package/libmicrohttpd/libmicrohttpd.mk    |  6 +++
 4 files changed, 52 insertions(+), 5 deletions(-)
 create mode 100644 package/libmicrohttpd/0001-fix-6135.patch
package/janus-gateway/Config.in +0 -1
index 9b70fa0cad..989ae26055 100644
@@ -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"
package/libmicrohttpd/0001-fix-6135.patch new file +46 -0

46 lines not on this page · raw message

package/libmicrohttpd/Config.in +0 -4
index 7f3c9bb8fd..8477ef6668 100644
@@ -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
package/libmicrohttpd/libmicrohttpd.mk +6 -0
index f47d7ec214..ea2de55804 100644
@@ -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))
Signature · 1 line
2.25.0
#1 lore raw

PATCH v2 1/1 package/libmicrohttpd: remove dependency on threads

Quoted 7 lines · On Fri, 27 Mar 2020 19:50:45 +0100 Bernd Kuhls <[email protected]> wrote:

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

---
v2: removed _REENTRANT hack (Thomas)
updated patch

Applied to master, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com