Message ID | 20240724163806.262384-1-fontaine.fabrice@gmail.com |
---|---|
State | Accepted |
Headers | show |
Series | [1/1] package/libressl: fix powerpc64 build | expand |
On Wed, 24 Jul 2024 18:38:06 +0200 Fabrice Fontaine <fontaine.fabrice@gmail.com> wrote: > Fix the following build failure with powerpc64 raised since bump to > version 3.8.2 in commit 21eca49ed5110872407b76ab9337d2877c4cda24: > > In file included from /home/autobuild/autobuild/instance-23/output-1/build/libressl-3.8.4/crypto/rc4/rc4_enc.c:61: > /home/autobuild/autobuild/instance-23/output-1/build/libressl-3.8.4/crypto/../include/openssl/rc4.h:75:9: error: unknown type name 'RC4_INT' > 75 | RC4_INT x, y; > | ^~~~~~~ > > Fixes: 21eca49ed5110872407b76ab9337d2877c4cda24 > - http://autobuild.buildroot.org/results/2533f8f642f435b40ce687b6df482c51a3fa0250 > > Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> > --- > ...ists-txt-Fix-HOST-variable-for-ppc64.patch | 26 +++++++++++++++++++ > 1 file changed, 26 insertions(+) > create mode 100644 package/libressl/0004-CMakeLists-txt-Fix-HOST-variable-for-ppc64.patch Applied to master, thanks. Thomas
>>>>> "Fabrice" == Fabrice Fontaine <fontaine.fabrice@gmail.com> writes: > Fix the following build failure with powerpc64 raised since bump to > version 3.8.2 in commit 21eca49ed5110872407b76ab9337d2877c4cda24: > In file included from /home/autobuild/autobuild/instance-23/output-1/build/libressl-3.8.4/crypto/rc4/rc4_enc.c:61: > /home/autobuild/autobuild/instance-23/output-1/build/libressl-3.8.4/crypto/../include/openssl/rc4.h:75:9: error: unknown type name 'RC4_INT' > 75 | RC4_INT x, y; > | ^~~~~~~ > Fixes: 21eca49ed5110872407b76ab9337d2877c4cda24 > - http://autobuild.buildroot.org/results/2533f8f642f435b40ce687b6df482c51a3fa0250 > Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> Committed to 2024.02.x and 2024.05.x, thanks.
diff --git a/package/libressl/0004-CMakeLists-txt-Fix-HOST-variable-for-ppc64.patch b/package/libressl/0004-CMakeLists-txt-Fix-HOST-variable-for-ppc64.patch new file mode 100644 index 0000000000..8da8fedae2 --- /dev/null +++ b/package/libressl/0004-CMakeLists-txt-Fix-HOST-variable-for-ppc64.patch @@ -0,0 +1,26 @@ +From e6c7de3f03c51fbdcf5ad88bf12fe9e128521f0d Mon Sep 17 00:00:00 2001 +From: OPNA2608 <opna2608@protonmail.com> +Date: Fri, 19 Jul 2024 11:41:46 +0200 +Subject: [PATCH] CMakeLists.txt: Fix HOST variable for ppc64 + +The code here defined HOST_PPC64, but the rest of the build system expects HOST_POWERPC64. + +Upstream: https://github.com/libressl/portable/commit/e6c7de3f03c51fbdcf5ad88bf12fe9e128521f0d +Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index c496ad97b5..670aa9a1a0 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -373,7 +373,7 @@ elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "mips") + elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "powerpc") + set(HOST_POWERPC true) + elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "ppc64") +- set(HOST_PPC64 true) ++ set(HOST_POWERPC64 true) + elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "riscv64") + set(HOST_RISCV64 true) + elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "sparc64")
Fix the following build failure with powerpc64 raised since bump to version 3.8.2 in commit 21eca49ed5110872407b76ab9337d2877c4cda24: In file included from /home/autobuild/autobuild/instance-23/output-1/build/libressl-3.8.4/crypto/rc4/rc4_enc.c:61: /home/autobuild/autobuild/instance-23/output-1/build/libressl-3.8.4/crypto/../include/openssl/rc4.h:75:9: error: unknown type name 'RC4_INT' 75 | RC4_INT x, y; | ^~~~~~~ Fixes: 21eca49ed5110872407b76ab9337d2877c4cda24 - http://autobuild.buildroot.org/results/2533f8f642f435b40ce687b6df482c51a3fa0250 Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> --- ...ists-txt-Fix-HOST-variable-for-ppc64.patch | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 package/libressl/0004-CMakeLists-txt-Fix-HOST-variable-for-ppc64.patch