From ca59b00bbd701b9e5e7ce213f44a4d7577d6d2db Mon Sep 17 00:00:00 2001 From: Tomas Mraz Date: Tue, 14 Apr 2020 12:16:22 +0200 Subject: [PATCH] Fix no-pic static builds The cipher_tdes_common causes build failure as being duplicated in libcrypto static builds. [extended tests] Reviewed-by: Richard Levitte (Merged from https://github.com/openssl/openssl/pull/11544) --- providers/implementations/ciphers/build.info | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/providers/implementations/ciphers/build.info b/providers/implementations/ciphers/build.info index c97008c330..a952c21638 100644 --- a/providers/implementations/ciphers/build.info +++ b/providers/implementations/ciphers/build.info @@ -63,8 +63,12 @@ IF[{- !$disabled{des} -}] cipher_tdes_default.c cipher_tdes_default_hw.c \ cipher_tdes_wrap.c cipher_tdes_wrap_hw.c SOURCE[$DES_GOAL]=\ - cipher_desx.c cipher_desx_hw.c cipher_tdes_common.c\ + cipher_desx.c cipher_desx_hw.c \ cipher_des.c cipher_des_hw.c + IF[{- !$disabled{module} -}] + SOURCE[$DES_GOAL]=\ + cipher_tdes_common.c + ENDIF ENDIF IF[{- !$disabled{aria} -}] -- 2.25.1