From 13fbd1f867f5de6b665134c2d3783ed1d59cce89 Mon Sep 17 00:00:00 2001 From: Christian Stenger Date: Mon, 13 Aug 2018 09:38:27 +0200 Subject: [PATCH] Botan: Fix compile if documentation tools are present Change-Id: If5adae5840cca75e3a1429922f48ea25b9903dc3 Reviewed-by: Eike Ziller Reviewed-by: Christian Kandeler --- src/libs/botan/botan.pro | 2 +- src/libs/botan/botan.qbs | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/libs/botan/botan.pro b/src/libs/botan/botan.pro index 91ce2e2995b..04feb8d3292 100644 --- a/src/libs/botan/botan.pro +++ b/src/libs/botan/botan.pro @@ -22,7 +22,7 @@ BOTAN_MODULES = aes aes_ssse3 auto_rng bigint block cbc ctr des dh dsa ec_group filters hmac mode_pad pubkey rsa sha1 sha1_sse2 sha1_x86 sha2_32 sha2_32_x86 \ sha2_64 simd system_rng,emsa_pkcs1,pbes2,pbkdf2 OTHER_FLAGS = --amalgamation --minimized-build --disable-shared \ - --enable-modules=$$join(BOTAN_MODULES,",",,) + --enable-modules=$$join(BOTAN_MODULES,",",,) --without-documentation mingw { BOTAN_OS_SWITCH = "--os=mingw" OTHER_FLAGS += --without-stack-protector diff --git a/src/libs/botan/botan.qbs b/src/libs/botan/botan.qbs index fa492b57347..04acfad0484 100644 --- a/src/libs/botan/botan.qbs +++ b/src/libs/botan/botan.qbs @@ -34,7 +34,8 @@ Product { fileTags: "hpp" } prepare: { - var args = [input.filePath, "--amalgamation", "--minimized-build", "--disable-shared"]; + var args = [input.filePath, "--amalgamation", "--minimized-build", "--disable-shared", + "--without-documentation"]; var modules = "aes,aes_ssse3,auto_rng,bigint,block,cbc,ctr,des,dh,dsa,ec_group,ecdh," + "ecdsa,entropy,filters,hmac,mode_pad,pubkey,rsa,sha1,sha1_sse2,sha1_x86," + "sha2_32,sha2_32_x86,sha2_64,simd,system_rng,emsa_pkcs1,pbes2,pbkdf2";