package/libcpprestsdk: zlib is optional, not mandatory
PATCH 1/2 package/libcpprestsdk: zlib is optional, not mandatory
--- package/libcpprestsdk/Config.in | 1 - package/libcpprestsdk/libcpprestsdk.mk | 9 ++++++++- 2 files changed, 8 insertions(+), 2 deletions(-)
package/libcpprestsdk/Config.in +0 -1
@@ -13,7 +13,6 @@ config BR2_PACKAGE_LIBCPPRESTSDK select BR2_PACKAGE_BOOST_REGEX select BR2_PACKAGE_BOOST_THREAD select BR2_PACKAGE_OPENSSL - select BR2_PACKAGE_ZLIB help The C++ REST SDK is a Microsoft project for cloud-based client-server communication in native code using a modern
package/libcpprestsdk/libcpprestsdk.mk +8 -1
@@ -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)
@@ -25,12 +25,19 @@ ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) LIBCPPRESTSDK_CXXFLAGS += -latomic endif +ifeq ($(BR2_PACKAGE_ZLIB),y) +LIBCPPRESTSDK_DEPENDENCIES += zlib +LIBCPPRESTSDK_CONF_OPTS += -DCPPREST_EXCLUDE_COMPRESSION=OFF +# brotli needs compression ifeq ($(BR2_PACKAGE_BROTLI),y) LIBCPPRESTSDK_DEPENDENCIES += brotli LIBCPPRESTSDK_CONF_OPTS += -DCPPREST_EXCLUDE_BROTLI=OFF else LIBCPPRESTSDK_CONF_OPTS += -DCPPREST_EXCLUDE_BROTLI=ON endif +else +LIBCPPRESTSDK_CONF_OPTS += -DCPPREST_EXCLUDE_COMPRESSION=ON +endif ifeq ($(BR2_PACKAGE_WEBSOCKETPP),y) LIBCPPRESTSDK_DEPENDENCIES += websocketpp
Signature · 1 line
2.25.1
PATCH 2/2 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
--- package/libcpprestsdk/Config.in | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
package/libcpprestsdk/Config.in +3 -2
@@ -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
@@ -21,10 +22,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
Signature · 1 line
2.25.1
Thomas Petazzoni
AppliedPATCH 2/2 package/libcpprestsdk: needs locale
Quoted 10 lines · On Sat, 14 Mar 2020 23:20:27 +0100 Fabrice Fontaine…
locale_tis unconditionally used since version 2.3.0 and
https://github.com/microsoft/cpprestsdk/commit/814caa4c0a80ef223535446a274146bf46a5ef2bFixes:
- No autobuilder failuresSigned-off-by Fabrice Fontaine <[email protected]>--- package/libcpprestsdk/Config.in | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
Applied to master, thanks.
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
PATCH 1/2 package/libcpprestsdk: zlib is optional, not mandatory
In reply to Fabrice Fontainepackage/libcpprestsdk/libcpprestsdk.mk ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) · line 31
Quoted 4 lines · On Sat, 14 Mar 2020 23:20:26 +0100 Fabrice Fontaine…
package/libcpprestsdk/libcpprestsdk.mk +4
-0+ifeq ($(BR2_PACKAGE_ZLIB),y) +LIBCPPRESTSDK_DEPENDENCIES += zlib +LIBCPPRESTSDK_CONF_OPTS += -DCPPREST_EXCLUDE_COMPRESSION=OFF +# brotli needs compression
What makes you think brotli needs zlib ? I had a quick look at the CMake logic and didn't find that.
Also, how did you test that? zlib is a dependency of openssl, and openssl is a mandatory dependency of libcpprestsdk. Did you test with libressl ?
Thanks,
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
PATCH 1/2 package/libcpprestsdk: zlib is optional, not mandatory
Dear Thomas,
Le dim. 15 mars 2020 ? 22:47, Thomas Petazzoni
<[email protected]> a ?crit :
Quoted 11 lines
package/libcpprestsdk/libcpprestsdk.mk ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) · line 31
Quoted 4 lines · On Sat, 14 Mar 2020 23:20:26 +0100 Fabrice Fontaine…
package/libcpprestsdk/libcpprestsdk.mk +4
-0+ifeq ($(BR2_PACKAGE_ZLIB),y) +LIBCPPRESTSDK_DEPENDENCIES += zlib +LIBCPPRESTSDK_CONF_OPTS += -DCPPREST_EXCLUDE_COMPRESSION=OFF +# brotli needs compressionWhat makes you think brotli needs zlib ? I had a quick look at the CMake logic and didn't find that.
From https://github.com/microsoft/cpprestsdk/blob/master/Release/src/CMakeLists.txt:
if(CPPREST_EXCLUDE_COMPRESSION)if(NOT CPPREST_EXCLUDE_BROTLI)message(FATAL_ERROR "Use of Brotli requires compression to be enabled") endif()
Quoted 4 lines
Also, how did you test that? zlib is a dependency of openssl, and openssl is a mandatory dependency of libcpprestsdk. Did you test with libressl ?
Yes, I build-tested it with libressl.
Quoted 8 lines
Thanks,
Thomas
--
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
Best Regards,
Fabrice
Thomas Petazzoni
AppliedPATCH 1/2 package/libcpprestsdk: zlib is optional, not mandatory
In reply to Fabrice FontaineQuoted 5 lines · On Sat, 14 Mar 2020 23:20:26 +0100 Fabrice Fontaine…
Signed-off-by Fabrice Fontaine <[email protected]>--- package/libcpprestsdk/Config.in | 1 - package/libcpprestsdk/libcpprestsdk.mk | 9 ++++++++- 2 files changed, 8 insertions(+), 2 deletions(-)
Applied to master, thanks.
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com