From f442823963b0c06895586ed15c117dd46db55f03 Mon Sep 17 00:00:00 2001 From: Duke Date: Mon, 13 Nov 2023 19:44:28 -0800 Subject: [PATCH] Fix unoptimized libraries in depends This was a bug we inherited from BTC which causes some dependencies to be built without optimization essentially replacing -O2 -pipe with -O0 because cxxflags is assigned to instead of appended to. We no longer have zeromq so for us this fixes the fact that bdb is being compiled without optimization. https://github.com/bitcoin/bitcoin/pull/22840 --- depends/packages/bdb.mk | 2 +- depends/packages/boost.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/depends/packages/bdb.mk b/depends/packages/bdb.mk index c8f677490..6b8b8e144 100644 --- a/depends/packages/bdb.mk +++ b/depends/packages/bdb.mk @@ -14,7 +14,7 @@ ifneq ($(build_os),darwin) $(package)_config_opts_darwin=--disable-atomicsupport endif $(package)_config_opts_aarch64=--disable-atomicsupport -$(package)_cxxflags=-std=c++11 +$(package)_cxxflags+=-std=c++11 endef define $(package)_preprocess_cmds diff --git a/depends/packages/boost.mk b/depends/packages/boost.mk index fde0c92c3..0062c0bdb 100644 --- a/depends/packages/boost.mk +++ b/depends/packages/boost.mk @@ -22,7 +22,7 @@ $(package)_archiver_$(host_os)=$($(package)_ar) $(package)_toolset_darwin=gcc $(package)_archiver_darwin=$($(package)_ar) $(package)_config_libraries=chrono,filesystem,program_options,system,thread,test -$(package)_cxxflags=-std=c++11 -fvisibility=hidden +$(package)_cxxflags+=-std=c++11 -fvisibility=hidden $(package)_cxxflags_linux=-fPIC endef