From c094f1bd5cff0c18d019bcb32d3650d1dee009ab Mon Sep 17 00:00:00 2001 From: Wenlong Zhang Date: Thu, 7 Mar 2024 06:12:25 +0000 Subject: [PATCH] Fix build error for loongarch64 (cherry picked from commit 480902f6c75810e02905098ce675c303d7d76bdf) (cherry picked from commit e23d8012560e42671d486b0020cec0520d16c190) --- fix-add-loongarch64-target.patch | 31 +++++++++++++++++++++++++++++++ openssl.spec | 8 ++++++-- 2 files changed, 37 insertions(+), 2 deletions(-) create mode 100644 fix-add-loongarch64-target.patch diff --git a/fix-add-loongarch64-target.patch b/fix-add-loongarch64-target.patch new file mode 100644 index 0000000..9999e97 --- /dev/null +++ b/fix-add-loongarch64-target.patch @@ -0,0 +1,31 @@ +From 5fd4cc31c0eba0813a005d3559afc1b42df8ee32 Mon Sep 17 00:00:00 2001 +From: Shi Pujin +Date: Wed, 16 Feb 2022 10:53:56 +0800 +Subject: [PATCH] Add loongarch64 target + +--- + Configurations/10-main.conf | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf +index 61c6689..7102c95 100644 +--- a/Configurations/10-main.conf ++++ b/Configurations/10-main.conf +@@ -761,6 +761,13 @@ my %targets = ( + perlasm_scheme => "linux64", + }, + ++ # loongarch64 below refers to contemporary LOONGARCH Architecture ++ # specifications, ++ "linux-loongarch64" => { ++ inherit_from => [ "linux-generic64"], ++ perlasm_scheme => "linux64", ++ }, ++ + #### IA-32 targets... + #### These two targets are a bit aged and are to be used on older Linux + #### machines where gcc doesn't understand -m32 and -m64 +-- +2.27.0 + + diff --git a/openssl.spec b/openssl.spec index 1c0d35b..e79deeb 100644 --- a/openssl.spec +++ b/openssl.spec @@ -2,7 +2,7 @@ Name: openssl Epoch: 1 Version: 3.0.12 -Release: 2 +Release: 3 Summary: Cryptography and SSL/TLS Toolkit License: OpenSSL and SSLeay URL: https://www.openssl.org/ @@ -31,6 +31,7 @@ Patch19: Backport-poly1305-ppc.pl-Fix-vector-register-clobbering.patch Patch20: Backport-Limit-the-execution-time-of-RSA-public-key-check.patch Patch21: Backport-Add-NULL-checks-where-ContentInfo-data-can-be-NULL.patch Patch22: Backport-Fix-SM4-XTS-aarch64-assembly-implementation-bug.patch +Patch23: fix-add-loongarch64-target.patch BuildRequires: gcc gcc-c++ perl make lksctp-tools-devel coreutils util-linux zlib-devel Requires: coreutils %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release} @@ -86,7 +87,7 @@ sslarch=%{_os}-%{_target_cpu} %ifarch i686 sslarch=linux-elf %endif -%ifarch riscv64 +%ifarch riscv64 loongarch64 sslarch=%{_os}64-%{_target_cpu} sslflags="--libdir=%{_libdir}" %endif @@ -231,6 +232,9 @@ make test || : %ldconfig_scriptlets libs %changelog +* Wed Mar 6 2024 Wenlong Zhang - 1:3.0.12-3 +- Fix build error for loongarch64 + * Thu Jan 18 2024 Xu Yizhou - 1:3.0.12-2 - Fix SM4-XTS aarch64 assembly implementation bug -- Gitee