From: Andreas Schneider Date: Tue, 10 Dec 2019 17:06:29 +0000 (+0100) Subject: lib:crypto: Build intel aes-ni only if GnuTLS doesn't provide AES CMAC X-Git-Tag: ldb-2.1.0~296 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=20b9cae63d5a5881cc6100a2533fab683cc307aa;p=thirdparty%2Fsamba.git lib:crypto: Build intel aes-ni only if GnuTLS doesn't provide AES CMAC Signed-off-by: Andreas Schneider Reviewed-by: Andrew Bartlett Autobuild-User(master): Andreas Schneider Autobuild-Date(master): Tue Dec 10 20:30:57 UTC 2019 on sn-devel-184 --- diff --git a/lib/crypto/wscript_build b/lib/crypto/wscript_build index 46ae5e9ba80..eb67af63f26 100644 --- a/lib/crypto/wscript_build +++ b/lib/crypto/wscript_build @@ -2,7 +2,8 @@ extra_deps = '' -if bld.CONFIG_SET("HAVE_AESNI_INTEL"): +if (bld.CONFIG_SET("HAVE_AESNI_INTEL") and + not bld.CONFIG_SET('HAVE_GNUTLS_AES_CMAC')): extra_deps += ' aesni-intel' bld.SAMBA_SUBSYSTEM('GNUTLS_HELPERS', diff --git a/third_party/aesni-intel/wscript b/third_party/aesni-intel/wscript index 955b5162140..382b3c6a7ff 100644 --- a/third_party/aesni-intel/wscript +++ b/third_party/aesni-intel/wscript @@ -21,7 +21,8 @@ def configure(conf): raise Errors.WafError('--accel-aes=intelaesni selected and linker rejects -z noexecstack') def build(bld): - if not bld.CONFIG_SET('HAVE_AESNI_INTEL'): + if (not bld.CONFIG_SET('HAVE_AESNI_INTEL') or + bld.CONFIG_SET('HAVE_GNUTLS_AES_CMAC')): return bld.SAMBA_LIBRARY('aesni-intel',