From a638457dfddb69c54c961112a49b2137a8bb02d9 Mon Sep 17 00:00:00 2001 From: Lucio Sauer Date: Fri, 19 Jul 2024 19:27:04 +0200 Subject: [PATCH] dev-libs/open62541: fix encryption backend selection behavior - The build system supports at most one backend (with preference for mbedtls over openssl if both are selected). Let's model that with REQUIRED_USE="?? ( mbedtls openssl )" - Removal of redundant "encryption" USE flag fixes incorrect dependencies when backend USE flags are enabled but the encryption USE flag is disabled. Signed-off-by: Lucio Sauer --- dev-libs/open62541/metadata.xml | 11 ++++------- dev-libs/open62541/open62541-1.4.2.ebuild | 10 ++++------ 2 files changed, 8 insertions(+), 13 deletions(-) diff --git a/dev-libs/open62541/metadata.xml b/dev-libs/open62541/metadata.xml index fd0da5f21e..c2b9267f3c 100644 --- a/dev-libs/open62541/metadata.xml +++ b/dev-libs/open62541/metadata.xml @@ -17,18 +17,15 @@ systems. - - Enable encryption support - - Use mbedtls for encryption + Enable encryption support using net-libs/mbedtls + + + Enable encryption support using dev-libs/openssl Enable OPC/UA Pub/Sub extensions - - Use openssl for encryption - Build additional shell tools diff --git a/dev-libs/open62541/open62541-1.4.2.ebuild b/dev-libs/open62541/open62541-1.4.2.ebuild index 48b4eddc10..1fb7eb285b 100644 --- a/dev-libs/open62541/open62541-1.4.2.ebuild +++ b/dev-libs/open62541/open62541-1.4.2.ebuild @@ -14,13 +14,13 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="MPL-2.0" SLOT="0" KEYWORDS="~amd64 ~arm64 ~x86" -IUSE="doc encryption examples mbedtls pubsub openssl tools" +IUSE="doc examples mbedtls pubsub openssl tools" # Requires network access RESTRICT="test" REQUIRED_USE=" ${PYTHON_REQUIRED_USE} - encryption? ( || ( mbedtls openssl ) ) + ?? ( mbedtls openssl ) " BDEPEND=" @@ -55,10 +55,8 @@ src_configure() { -DUA_FORCE_WERROR=OFF ) - if use encryption; then - use mbedtls && mycmakeargs+=(-DUA_ENABLE_ENCRYPTION=MBEDTLS) - use openssl && mycmakeargs+=(-DUA_ENABLE_ENCRYPTION=OPENSSL) - fi + use mbedtls && mycmakeargs+=(-DUA_ENABLE_ENCRYPTION=MBEDTLS) + use openssl && mycmakeargs+=(-DUA_ENABLE_ENCRYPTION=OPENSSL) cmake_src_configure }