From a61fc6775afb9cf146e768cea13215375afed07f Mon Sep 17 00:00:00 2001 From: Duke Leto Date: Sat, 14 Nov 2020 17:27:09 -0500 Subject: [PATCH] Tweak WolfSSL build settings --- depends/funcs.mk | 4 ++-- depends/packages/wolfssl.mk | 5 +++++ src/zcash/JoinSplit.cpp | 2 -- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/depends/funcs.mk b/depends/funcs.mk index 35ca5abcf..289a400cb 100644 --- a/depends/funcs.mk +++ b/depends/funcs.mk @@ -193,13 +193,13 @@ $($(1)_preprocessed): | $($(1)_dependencies) $($(1)_extracted) $(AT)cd $$(@D); $(call $(1)_preprocess_cmds, $(1)) $(AT)touch $$@ $($(1)_configured): | $($(1)_preprocessed) - $(AT)echo Configuring $(1)... + $(AT)echo Cthulhu fhtagn Configuring $(1)... $(AT)rm -rf $(host_prefix); mkdir -p $(host_prefix)/lib; cd $(host_prefix); $(foreach package,$($(1)_all_dependencies), tar --no-same-owner -xf $($(package)_cached); ) $(AT)mkdir -p $$(@D) $(AT)+cd $$(@D); $($(1)_config_env) $(call $(1)_config_cmds, $(1)) $(AT)touch $$@ $($(1)_built): | $($(1)_configured) - $(AT)echo Building $(1)... + $(AT)echo Iä! Iä! Building $(1)... $(AT)mkdir -p $$(@D) $(AT)+cd $$(@D); $($(1)_build_env) $(call $(1)_build_cmds, $(1)) $(AT)touch $$@ diff --git a/depends/packages/wolfssl.mk b/depends/packages/wolfssl.mk index e0e73d7f6..03f323b3a 100644 --- a/depends/packages/wolfssl.mk +++ b/depends/packages/wolfssl.mk @@ -10,11 +10,16 @@ $(package)_config_env=AR="$($(package)_ar)" RANLIB="$($(package)_ranlib)" CC="$( $(package)_config_opts=--prefix=$(host_prefix) $(package)_config_opts+=--host=$(host) $(package)_config_opts+=--enable-static +$(package)_config_opts+=--enable-debug +$(package)_config_opts+=--enable-tls13 +#$(package)_config_opts+=--disable-tlsv12 +#$(package)_config_opts+=--disable-oldtls $(package)_config_opts+=--disable-shared $(package)_config_opts+=--disable-examples $(package)_config_opts+=--disable-crypttests $(package)_config_opts+=--enable-keygen $(package)_config_opts+=--enable-certgen +$(package)_config_opts+=--enable-bigcache $(package)_config_opts+=--enable-enckeys $(package)_config_opts+=--enable-opensslall $(package)_config_opts+=--enable-opensslextra diff --git a/src/zcash/JoinSplit.cpp b/src/zcash/JoinSplit.cpp index f4690f5dd..8a53a5ade 100644 --- a/src/zcash/JoinSplit.cpp +++ b/src/zcash/JoinSplit.cpp @@ -12,8 +12,6 @@ namespace libzcash { -static CCriticalSection cs_ParamsIO; - template class JoinSplitCircuit : public JoinSplit { public: