From 3037e99ae67f159626c0b148da46008e1dd23e91 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 14 Mar 2020 23:20:27 +0100 Subject: [PATCH] package/libcpprestsdk: needs locale locale_t is unconditionally used since version 2.3.0 and https://github.com/microsoft/cpprestsdk/commit/814caa4c0a80ef223535446a274146bf46a5ef2b Fixes: - No autobuilder failures Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/libcpprestsdk/Config.in | 5 +++-- package/libcpprestsdk/libcpprestsdk.mk | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/package/libcpprestsdk/Config.in b/package/libcpprestsdk/Config.in index a07159b124..01ebc6aa7f 100644 --- a/package/libcpprestsdk/Config.in +++ b/package/libcpprestsdk/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_LIBCPPRESTSDK bool "libcpprestsdk" + depends on BR2_ENABLE_LOCALE depends on BR2_INSTALL_LIBSTDCPP depends on BR2_USE_WCHAR # boost depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # exception_ptr @@ -22,10 +23,10 @@ config BR2_PACKAGE_LIBCPPRESTSDK https://github.com/Microsoft/cpprestsdk -comment "libcpprestsdk needs a toolchain w/ NPTL, C++, wchar" +comment "libcpprestsdk needs a toolchain w/ NPTL, C++, wchar, locale" depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL || \ !BR2_INSTALL_LIBSTDCPP || \ - !BR2_USE_WCHAR + !BR2_USE_WCHAR || !BR2_ENABLE_LOCALE comment "libcpprestsdk needs exception_ptr" depends on BR2_TOOLCHAIN_HAS_GCC_BUG_64735 diff --git a/package/libcpprestsdk/libcpprestsdk.mk b/package/libcpprestsdk/libcpprestsdk.mk index 8404b5096c..e746f22b1b 100644 --- a/package/libcpprestsdk/libcpprestsdk.mk +++ b/package/libcpprestsdk/libcpprestsdk.mk @@ -10,7 +10,7 @@ LIBCPPRESTSDK_LICENSE = MIT LIBCPPRESTSDK_LICENSE_FILES = license.txt LIBCPPRESTSDK_SUBDIR = Release LIBCPPRESTSDK_INSTALL_STAGING = YES -LIBCPPRESTSDK_DEPENDENCIES += host-pkgconf boost openssl zlib +LIBCPPRESTSDK_DEPENDENCIES += host-pkgconf boost openssl LIBCPPRESTSDK_CONF_OPTS = -DWERROR=OFF -DBUILD_SAMPLES=OFF ifeq ($(BR2_STATIC_LIBS),y) -- 2.30.2