From f18c4dbdcee9e4b42406a3ef96dc2a38e947d810 Mon Sep 17 00:00:00 2001 From: Stephan Hoffmann Date: Mon, 21 Sep 2026 18:54:37 +0200 Subject: [PATCH] package/libhttpserver: bump to version 2.0.0 Version 2.0.0 requires C++20 and GCC 11 or newer. This major release changes the API exposed to applications. However, the 0.x release series is end-of-life, so staying on version 0.19.0 is not a viable option. The build system detects GnuTLS through its headers and links to it directly. Make this detection deterministic by following the libmicrohttpd SSL option and adding the corresponding dependency. https://github.com/etr/libhttpserver/releases/tag/2.0.0 Signed-off-by: Stephan Hoffmann Signed-off-by: Julien Olivain --- package/libhttpserver/Config.in | 6 +++--- package/libhttpserver/libhttpserver.hash | 2 +- package/libhttpserver/libhttpserver.mk | 8 +++++++- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/package/libhttpserver/Config.in b/package/libhttpserver/Config.in index 3120059a08..88f3aa0a74 100644 --- a/package/libhttpserver/Config.in +++ b/package/libhttpserver/Config.in @@ -1,6 +1,6 @@ config BR2_PACKAGE_LIBHTTPSERVER bool "libhttpserver" - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # C++17 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_11 # C++20 depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_HAS_THREADS select BR2_PACKAGE_LIBMICROHTTPD @@ -12,6 +12,6 @@ config BR2_PACKAGE_LIBHTTPSERVER https://github.com/etr/libhttpserver -comment "libhttpserver needs a toolchain w/ C++, threads, gcc >= 7" +comment "libhttpserver needs a toolchain w/ C++, threads, gcc >= 11" depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_7 + !BR2_TOOLCHAIN_GCC_AT_LEAST_11 diff --git a/package/libhttpserver/libhttpserver.hash b/package/libhttpserver/libhttpserver.hash index 03ebdc4a76..b6b1987464 100644 --- a/package/libhttpserver/libhttpserver.hash +++ b/package/libhttpserver/libhttpserver.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 b108769ed68d72c58961c517ab16c3a64e4efdc4c45687723bb45bb9e04c5193 libhttpserver-0.19.0.tar.gz +sha256 c44d67aba1e4b6767c0fbb895e1acd643601c1e3ee3de7705a59ed09bcd8c92e libhttpserver-2.0.0.tar.gz sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a COPYING.LESSER diff --git a/package/libhttpserver/libhttpserver.mk b/package/libhttpserver/libhttpserver.mk index 54774e763b..7b7aedef0d 100644 --- a/package/libhttpserver/libhttpserver.mk +++ b/package/libhttpserver/libhttpserver.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBHTTPSERVER_VERSION = 0.19.0 +LIBHTTPSERVER_VERSION = 2.0.0 LIBHTTPSERVER_SITE = $(call github,etr,libhttpserver,$(LIBHTTPSERVER_VERSION)) LIBHTTPSERVER_LICENSE = LGPL-2.1+ LIBHTTPSERVER_LICENSE_FILES = COPYING.LESSER @@ -15,4 +15,10 @@ LIBHTTPSERVER_CONF_OPTS = \ LIBHTTPSERVER_AUTORECONF = YES LIBHTTPSERVER_DEPENDENCIES = libmicrohttpd +ifeq ($(BR2_PACKAGE_LIBMICROHTTPD_SSL),y) +LIBHTTPSERVER_DEPENDENCIES += gnutls +else +LIBHTTPSERVER_CONF_ENV += ac_cv_header_gnutls_gnutls_h=no +endif + $(eval $(autotools-package))