From dea83528efedb5e6f2d8236198f1da5fc8d1a045 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 3 Apr 2022 16:00:24 +0200 Subject: [PATCH] package/glib-networking: doesn't support libressl glib-networking raises the following build failure with libressl: ../tls/openssl/gtlsconnection-openssl.c: In function 'g_tls_connection_openssl_handshake_thread_request_rehandshake': ../tls/openssl/gtlsconnection-openssl.c:419:27: error: 'TLS1_3_VERSION' undeclared (first use in this function); did you mean 'TLS1_2_VERSION'? 419 | if (SSL_version(ssl) >= TLS1_3_VERSION) | ^~~~~~~~~~~~~~ | TLS1_2_VERSION ../tls/openssl/gtlsconnection-openssl.c:419:27: note: each undeclared identifier is reported only once for each function it appears in ../tls/openssl/gtlsconnection-openssl.c:420:11: error: implicit declaration of function 'SSL_key_update' [-Werror=implicit-function-declaration] 420 | ret = SSL_key_update (ssl, SSL_KEY_UPDATE_REQUESTED); | ^~~~~~~~~~~~~~ Since libressl doesn't (intend to) support post-1.0.2 openssl compatibility, this is only going to get worse. Therefore, require libopenssl. Fixes: - http://autobuild.buildroot.org/results/b8dea5704903c84858c7a339a73ecb713ac2791c Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit e02514ad7a11c24b8fbd7a4bd57c7b4419a61505) Signed-off-by: Peter Korsgaard --- package/glib-networking/Config.in | 1 + package/glib-networking/glib-networking.mk | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/package/glib-networking/Config.in b/package/glib-networking/Config.in index 38cded5e6b..9c5d36af16 100644 --- a/package/glib-networking/Config.in +++ b/package/glib-networking/Config.in @@ -6,6 +6,7 @@ config BR2_PACKAGE_GLIB_NETWORKING depends on !BR2_STATIC_LIBS select BR2_PACKAGE_LIBGLIB2 select BR2_PACKAGE_OPENSSL if !BR2_PACKAGE_GNUTLS + select BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL if !BR2_PACKAGE_GNUTLS select BR2_PACKAGE_P11_KIT if BR2_PACKAGE_GNUTLS help Network-related GIO modules for glib. diff --git a/package/glib-networking/glib-networking.mk b/package/glib-networking/glib-networking.mk index f74e520d31..e8905dfff4 100644 --- a/package/glib-networking/glib-networking.mk +++ b/package/glib-networking/glib-networking.mk @@ -31,7 +31,7 @@ else GLIB_NETWORKING_CONF_OPTS += -Dgnutls=disabled endif -ifeq ($(BR2_PACKAGE_OPENSSL),y) +ifeq ($(BR2_PACKAGE_LIBOPENSSL),y) GLIB_NETWORKING_DEPENDENCIES += openssl GLIB_NETWORKING_CONF_OPTS += -Dopenssl=enabled else