From 595509cc781e7d45d19ddead24a0c424c610b5c0 Mon Sep 17 00:00:00 2001 From: Eneas U de Queiroz Date: Tue, 21 Feb 2023 17:55:26 -0300 Subject: [PATCH] openssl: fix powerpc & arc libatomic dependencies PowerPC CONFIG_ARCH is defined as powerpc, not ppc. Fix that in the DEPENDS condition. Arc needs to be built with libatomic. Change the OpenSSL configuration file, and add it to the libatomic DEPENDS condition. Fixes: 7e7e76afca "openssl: bump to 3.0.8" Signed-off-by: Eneas U de Queiroz --- package/libs/openssl/Makefile | 4 ++-- package/libs/openssl/patches/110-openwrt_targets.patch | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libs/openssl/Makefile b/package/libs/openssl/Makefile index 7dc4df0982a7..153d14a4469c 100644 --- a/package/libs/openssl/Makefile +++ b/package/libs/openssl/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=openssl PKG_VERSION:=3.0.8 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_USE_MIPS16:=0 PKG_BUILD_PARALLEL:=1 @@ -95,7 +95,7 @@ $(call Package/openssl/Default) +OPENSSL_ENGINE_BUILTIN_AFALG:kmod-crypto-user \ +OPENSSL_ENGINE_BUILTIN_DEVCRYPTO:kmod-cryptodev \ +OPENSSL_ENGINE_BUILTIN_PADLOCK:kmod-crypto-hw-padlock \ - +(arm||armeb||mips||mipsel||ppc):libatomic + +(arm||armeb||mips||mipsel||powerpc||arc):libatomic TITLE+= (libraries) ABI_VERSION:=$(firstword $(subst .,$(space),$(PKG_VERSION))) MENU:=1 diff --git a/package/libs/openssl/patches/110-openwrt_targets.patch b/package/libs/openssl/patches/110-openwrt_targets.patch index 6b4fbad0a78a..5abedd400e3b 100644 --- a/package/libs/openssl/patches/110-openwrt_targets.patch +++ b/package/libs/openssl/patches/110-openwrt_targets.patch @@ -23,7 +23,7 @@ Signed-off-by: Eneas U de Queiroz + inherit_from => [ "linux-aarch64", "openwrt" ], + }, + "linux-arc-openwrt" => { -+ inherit_from => [ "linux-generic32", "openwrt" ], ++ inherit_from => [ "linux-latomic", "openwrt" ], + }, + "linux-arm-openwrt" => { + inherit_from => [ "linux-armv4", "openwrt" ], -- 2.30.2