aboutsummaryrefslogtreecommitdiff
path: root/providers
diff options
context:
space:
mode:
authorTomas Mraz <tmraz@fedoraproject.org>2020-04-14 12:16:22 +0200
committerTomas Mraz <tmraz@fedoraproject.org>2020-04-15 11:46:00 +0200
commitca59b00bbd701b9e5e7ce213f44a4d7577d6d2db (patch)
tree9a04113b5e5124c156634b3a332a1c1e91ac9b40 /providers
parent49276c3569656a17c24517ff0781967ced2c9658 (diff)
downloadopenssl-ca59b00bbd701b9e5e7ce213f44a4d7577d6d2db.zip
openssl-ca59b00bbd701b9e5e7ce213f44a4d7577d6d2db.tar.gz
openssl-ca59b00bbd701b9e5e7ce213f44a4d7577d6d2db.tar.bz2
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 <levitte@openssl.org> (Merged from https://github.com/openssl/openssl/pull/11544)
Diffstat (limited to 'providers')
-rw-r--r--providers/implementations/ciphers/build.info6
1 files changed, 5 insertions, 1 deletions
diff --git a/providers/implementations/ciphers/build.info b/providers/implementations/ciphers/build.info
index c97008c..a952c21 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} -}]