From 86c97f4f4b2042e2a62d6d6a48eb85e738ca9f7a Mon Sep 17 00:00:00 2001 From: Tomas Mraz Date: Tue, 19 Jun 2018 16:58:06 +0200 Subject: [PATCH] Make the afalg engine build. There is a conflict in some types between glibc and linux headers. Adding a hack to avoid it. --- openssl-1.1.0-build.patch | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/openssl-1.1.0-build.patch b/openssl-1.1.0-build.patch index bedd957..3d035a8 100644 --- a/openssl-1.1.0-build.patch +++ b/openssl-1.1.0-build.patch @@ -38,6 +38,31 @@ diff -up openssl-1.1.0f/Configurations/10-main.conf.build openssl-1.1.0f/Configu }, "linux-arm64ilp32" => { # https://wiki.linaro.org/Platform/arm64-ilp32 inherit_from => [ "linux-generic32", asm("aarch64_asm") ], +diff -up openssl-1.1.0h/engines/afalg/e_afalg.c.build openssl-1.1.0h/engines/afalg/e_afalg.c +--- openssl-1.1.0h/engines/afalg/e_afalg.c.build 2018-03-27 15:50:40.000000000 +0200 ++++ openssl-1.1.0h/engines/afalg/e_afalg.c 2018-06-19 16:56:20.150950529 +0200 +@@ -36,14 +36,19 @@ void engine_load_afalg_int(void) + } + #else + +-# include + # include + # include + +-# include + # include + # include + ++# define timespec linux_timespec ++# define timeval linux_timeval ++# define itimerspec linux_itimerspec ++# define sigset_t linux_sigset_type ++# include ++# include ++ + # include "e_afalg.h" + + # define AFALG_LIB_NAME "AFALG" diff -up openssl-1.1.0g/test/evptests.txt.build openssl-1.1.0g/test/evptests.txt --- openssl-1.1.0g/test/evptests.txt.build 2017-11-02 15:29:05.000000000 +0100 +++ openssl-1.1.0g/test/evptests.txt 2017-11-03 16:37:01.253671494 +0100