mirror of
https://gitlab.com/buildroot.org/buildroot.git
synced 2026-09-08 23:51:08 -09:00
Merge branch 'next'
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
@@ -4,20 +4,20 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
CPP_HTTPLIB_VERSION = 0.19.0
|
||||
CPP_HTTPLIB_VERSION = 0.25.0
|
||||
CPP_HTTPLIB_SITE = $(call github,yhirose,cpp-httplib,v$(CPP_HTTPLIB_VERSION))
|
||||
CPP_HTTPLIB_LICENSE = MIT
|
||||
CPP_HTTPLIB_LICENSE_FILES = LICENSE
|
||||
CPP_HTTPLIB_CPE_ID_VALID = YES
|
||||
CPP_HTTPLIB_INSTALL_STAGING = YES
|
||||
CPP_HTTPLIB_CONF_OPTS = \
|
||||
-Dcpp-httplib_test=false
|
||||
-Dtest=false
|
||||
|
||||
# 0001-merge-commit-from-fork.patch
|
||||
CPP_HTTPLIB_IGNORE_CVES += CVE-2025-46728
|
||||
|
||||
ifeq ($(BR2_PACKAGE_CPP_HTTPLIB_COMPILE),y)
|
||||
CPP_HTTPLIB_CONF_OPTS += -Dcpp-httplib_compile=true
|
||||
CPP_HTTPLIB_CONF_OPTS += -Dcompile=true
|
||||
CPP_HTTPLIB_DEPENDENCIES += host-python3
|
||||
else
|
||||
# Header only library
|
||||
@@ -25,24 +25,24 @@ CPP_HTTPLIB_INSTALL_TARGET = NO
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_OPENSSL),y)
|
||||
CPP_HTTPLIB_CONF_OPTS += -Dcpp-httplib_openssl=enabled
|
||||
CPP_HTTPLIB_CONF_OPTS += -Dopenssl=enabled
|
||||
CPP_HTTPLIB_DEPENDENCIES += openssl
|
||||
else
|
||||
CPP_HTTPLIB_CONF_OPTS += -Dcpp-httplib_openssl=disabled
|
||||
CPP_HTTPLIB_CONF_OPTS += -Dopenssl=disabled
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_ZLIB),y)
|
||||
CPP_HTTPLIB_CONF_OPTS += -Dcpp-httplib_zlib=enabled
|
||||
CPP_HTTPLIB_CONF_OPTS += -Dzlib=enabled
|
||||
CPP_HTTPLIB_DEPENDENCIES += zlib
|
||||
else
|
||||
CPP_HTTPLIB_CONF_OPTS += -Dcpp-httplib_zlib=disabled
|
||||
CPP_HTTPLIB_CONF_OPTS += -Dzlib=disabled
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_BROTLI),y)
|
||||
CPP_HTTPLIB_CONF_OPTS += -Dcpp-httplib_brotli=enabled
|
||||
CPP_HTTPLIB_CONF_OPTS += -Dbrotli=enabled
|
||||
CPP_HTTPLIB_DEPENDENCIES += brotli
|
||||
else
|
||||
CPP_HTTPLIB_CONF_OPTS += -Dcpp-httplib_brotli=disabled
|
||||
CPP_HTTPLIB_CONF_OPTS += -Dbrotli=disabled
|
||||
endif
|
||||
|
||||
$(eval $(meson-package))
|
||||
|
||||
Reference in New Issue
Block a user