From 858bbe3ba65e8a2db83a786dc7b104aa53f67486 Mon Sep 17 00:00:00 2001 From: peng_zou Date: Tue, 25 Jun 2024 10:37:14 +0800 Subject: [PATCH] fix build error for ppc64le --- Fix-build-error-for-ppc64le.patch | 31 +++++++++++++++++++++++++++++++ openssl.spec | 8 ++++++-- 2 files changed, 37 insertions(+), 2 deletions(-) create mode 100644 Fix-build-error-for-ppc64le.patch diff --git a/Fix-build-error-for-ppc64le.patch b/Fix-build-error-for-ppc64le.patch new file mode 100644 index 0000000..a6b1b12 --- /dev/null +++ b/Fix-build-error-for-ppc64le.patch @@ -0,0 +1,31 @@ +From 4d2ed81fcc1f21aa651fb5cc4555ea21cfd3d232 Mon Sep 17 00:00:00 2001 +From: peng_zou +Date: Tue, 25 Jun 2024 10:33:28 +0800 +Subject: [PATCH] Fix build error for ppc64le + +--- + Configurations/10-main.conf | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf +index 915e7dd..27433ce 100644 +--- a/Configurations/10-main.conf ++++ b/Configurations/10-main.conf +@@ -734,6 +734,14 @@ my %targets = ( + asm_arch => 'ppc64', + perlasm_scheme => "linux64le", + }, ++ "linux64-ppc64le" => { ++ inherit_from => [ "linux-generic64" ], ++ cflags => add("-m64"), ++ cxxflags => add("-m64"), ++ lib_cppflags => add("-DL_ENDIAN"), ++ asm_arch => 'ppc64', ++ perlasm_scheme => "linux64le", ++ }, + + "linux-armv4" => { + ################################################################ +-- +2.43.0 + diff --git a/openssl.spec b/openssl.spec index 3187fdd..125cf51 100644 --- a/openssl.spec +++ b/openssl.spec @@ -2,7 +2,7 @@ Name: openssl Epoch: 1 Version: 3.0.12 -Release: 7 +Release: 8 Summary: Cryptography and SSL/TLS Toolkit License: OpenSSL and SSLeay URL: https://www.openssl.org/ @@ -46,6 +46,7 @@ Patch34: Backport-CVE-2024-4741-Extend-the-SSL_free_buffers-testing.patch Patch35: Backport-CVE-2024-4741-Move-the-ability-to-load-the-dasync-engine-into-sslt.patch Patch36: Backport-CVE-2024-4741-Further-extend-the-SSL_free_buffers-testing.patch Patch37: Backport-bn-Properly-error-out-if-aliasing-return-value-with-.patch +Patch38: Fix-build-error-for-ppc64le.patch BuildRequires: gcc gcc-c++ perl make lksctp-tools-devel coreutils util-linux zlib-devel Requires: coreutils %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release} @@ -101,7 +102,7 @@ sslarch=%{_os}-%{_target_cpu} %ifarch i686 sslarch=linux-elf %endif -%ifarch riscv64 loongarch64 +%ifarch riscv64 loongarch64 ppc64le sslarch=%{_os}64-%{_target_cpu} sslflags="--libdir=%{_libdir}" %endif @@ -246,6 +247,9 @@ make test || : %ldconfig_scriptlets libs %changelog +* Tue Jun 25 2024 peng.zou - 1:3.0.12-8 +- Fix build error for ppc64le + * Mon Jun 24 2024 steven - 1:3.0.12-7 - backport patch -- Gitee