diff options
| author | Eneas U de Queiroz <cotequeiroz@gmail.com> | 2023-02-21 17:55:26 -0300 |
|---|---|---|
| committer | Eneas U de Queiroz <cotequeiroz@gmail.com> | 2023-02-22 11:05:06 -0300 |
| commit | 595509cc781e7d45d19ddead24a0c424c610b5c0 (patch) | |
| tree | cbabee715fd260cd00361c3e3ccc5718aa895d6e | |
| parent | 00c5276659cb9929fc5010ebe2f2f10b4d4cf9ef (diff) | |
| download | upstream-595509cc781e7d45d19ddead24a0c424c610b5c0.tar.gz upstream-595509cc781e7d45d19ddead24a0c424c610b5c0.tar.bz2 upstream-595509cc781e7d45d19ddead24a0c424c610b5c0.zip | |
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 <cotequeiroz@gmail.com>
| -rw-r--r-- | package/libs/openssl/Makefile | 4 | ||||
| -rw-r--r-- | 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 7dc4df0982..153d14a446 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 6b4fbad0a7..5abedd400e 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 <cote2004-github@yahoo.com> + 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" ], |