From f622944bc88a895601955d5ce13a2b7015e54232 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 6 Feb 2024 20:47:10 +0100 Subject: [PATCH] package/libp11: drop libressl support libressl dropped engine support since version 3.8.1 resulting in the following build failure since bump of libressl to version 3.8.2 in commit 21eca49ed5110872407b76ab9337d2877c4cda24: eng_front.c: In function 'IMPLEMENT_DYNAMIC_CHECK_FN': eng_front.c:262:1: error: expected declaration specifiers before 'IMPLEMENT_DYNAMIC_BIND_FN' 262 | IMPLEMENT_DYNAMIC_BIND_FN(bind_fn) | ^~~~~~~~~~~~~~~~~~~~~~~~~ Fixes: - http://autobuild.buildroot.org/results/389ed112f082a4917f777f3e236211059c4c6d6e Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/libp11/Config.in | 1 + package/libp11/libp11.mk | 8 +------- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/package/libp11/Config.in b/package/libp11/Config.in index ef1e5b4703..3c7ccdee27 100644 --- a/package/libp11/Config.in +++ b/package/libp11/Config.in @@ -3,6 +3,7 @@ config BR2_PACKAGE_LIBP11 depends on !BR2_STATIC_LIBS # dlopen depends on BR2_TOOLCHAIN_HAS_THREADS select BR2_PACKAGE_OPENSSL + select BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL help OpenSSL engine for PKCS#11 modules. Part of the OpenSC project. diff --git a/package/libp11/libp11.mk b/package/libp11/libp11.mk index 7718573ace..cd4ed34297 100644 --- a/package/libp11/libp11.mk +++ b/package/libp11/libp11.mk @@ -11,16 +11,10 @@ LIBP11_INSTALL_STAGING = YES LIBP11_LICENSE = LGPL-2.1+ LIBP11_LICENSE_FILES = COPYING -ifeq ($(BR2_PACKAGE_LIBOPENSSL),y) -LIBP11_ENGINESDIR = enginesdir -else ifeq ($(BR2_PACKAGE_LIBRESSL),y) -LIBP11_ENGINESDIR = libdir -endif - # pkg-config returns a libcrypto enginesdir prefixed with the sysroot, # so let's rip it out. LIBP11_CONF_OPTS = \ - --with-enginesdir=`$(PKG_CONFIG_HOST_BINARY) --variable $(LIBP11_ENGINESDIR) libcrypto | xargs readlink -f | sed 's%^$(STAGING_DIR)%%'` + --with-enginesdir=`$(PKG_CONFIG_HOST_BINARY) --variable enginesdir libcrypto | xargs readlink -f | sed 's%^$(STAGING_DIR)%%'` ifeq ($(BR2_PACKAGE_P11_KIT),y) LIBP11_CONF_OPTS += --with-pkcs11-module=/usr/lib/p11-kit-proxy.so