From d3b6f8fa3cbc9c245c85a0963a8b446455f15e6c Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 3 Dec 2023 19:29:11 +0100 Subject: [PATCH] package/openssl: add and use BR2_PACKAGE_LIBRESSL_ARCH_SUPPORTS libressl doesn't support all architectures since bump to version 3.8.2 in commit 21eca49ed5110872407b76ab9337d2877c4cda24 and https://github.com/libressl/portable/commit/b98c56fd5e86fa76eb55a98a2266a923f64f705c https://github.com/libressl/portable/commit/71ce0b8c3e07079a40011d2f3515969e3bdf302e: In file included from /home/autobuild/autobuild/instance-4/output-1/build/libressl-3.8.2/crypto/rc4/rc4_enc.c:61: /home/autobuild/autobuild/instance-4/output-1/build/libressl-3.8.2/crypto/../include/openssl/rc4.h:75:9: error: unknown type name 'RC4_INT' 75 | RC4_INT x, y; | ^~~~~~~ Fixes: - http://autobuild.buildroot.org/results/1f6ac121b3771ccc4b0e846c061b7002ccb63963 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit 080f2d94b7ac6e8ed5aef99000ec35a001186ed9) Signed-off-by: Peter Korsgaard --- package/openssl/Config.in | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/package/openssl/Config.in b/package/openssl/Config.in index c7641ecefa..30db152fad 100644 --- a/package/openssl/Config.in +++ b/package/openssl/Config.in @@ -1,3 +1,14 @@ +config BR2_PACKAGE_LIBRESSL_ARCH_SUPPORTS + bool + # see include/CMakeLists.txt + default y if BR2_aarch64 || BR2_aarch64_be + default y if BR2_arm || BR2_armeb + default y if BR2_i386 || BR2_x86_64 + default y if BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el + default y if BR2_powerpc || BR2_powerpc64 || BR2_powerpc64le + default y if BR2_RISCV_64 + default y if BR2_sparc64 + config BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL bool @@ -32,6 +43,7 @@ source "package/libopenssl/Config.in" config BR2_PACKAGE_LIBRESSL bool "libressl" + depends on BR2_PACKAGE_LIBRESSL_ARCH_SUPPORTS depends on !BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL depends on BR2_TOOLCHAIN_HAS_THREADS # uClibc doesn't provide __register_atfork() without NPTL