From c91af646d6fb49b13370b2b631d3c777370be70e Mon Sep 17 00:00:00 2001
From: such-gitea <jw@such.software>
Date: Sat, 24 Jan 2026 09:44:41 -0500
Subject: [PATCH] Add context and coroutine for LWS

---
 contrib/depends/packages/boost.mk | 48 ++++++++++++++++++-------------
 1 file changed, 28 insertions(+), 20 deletions(-)

diff --git a/contrib/depends/packages/boost.mk b/contrib/depends/packages/boost.mk
index 3760f106f..7ade598af 100644
--- a/contrib/depends/packages/boost.mk
+++ b/contrib/depends/packages/boost.mk
@@ -6,36 +6,44 @@ $(package)_sha256_hash=49551aff3b22cbc5c5a9ed3dbc92f0e23ea50a0f7325b0d198b705e8e
 $(package)_dependencies=libiconv
 
 define $(package)_set_vars
-$(package)_config_opts_release=variant=release
-$(package)_config_opts_debug=variant=debug
-$(package)_config_opts+=--layout=tagged --user-config=user-config.jam
-$(package)_config_opts+=threading=multi link=static -sNO_BZIP2=1 -sNO_ZLIB=1
-$(package)_config_opts_linux=threadapi=pthread runtime-link=static
-$(package)_config_opts_darwin=target-os=darwin address-model=64 runtime-link=shared
-$(package)_config_opts_mingw32=binary-format=pe target-os=windows threadapi=win32 runtime-link=static
-$(package)_config_opts_x86_64_mingw32=address-model=64
-$(package)_config_opts_i686_mingw32=address-model=32
-$(package)_config_opts_i686_linux=address-model=32 architecture=x86
-$(package)_toolset_$(host_os)=gcc
-$(package)_archiver_$(host_os)=$($(package)_ar)
-$(package)_toolset_darwin=darwin
-$(package)_archiver_darwin=$($(package)_libtool)
-$(package)_config_libraries=chrono,filesystem,program_options,system,thread,test,date_time,regex,serialization,locale,context,coroutine
-$(package)_cxxflags=-std=c++17 -fPIC
+  $(package)_config_opts_release=variant=release
+  $(package)_config_opts_debug=variant=debug
+  
+  # KEY FIX: Use 'system' layout to avoid weird naming (libboost_filesystem.a vs libboost_filesystem-mt-x64.a)
+  $(package)_config_opts+=--layout=system --user-config=user-config.jam
+  $(package)_config_opts+=threading=multi link=static -sNO_BZIP2=1 -sNO_ZLIB=1
+  
+  # CRITICAL: Force static runtime for Linux to fix "Wrong Format" linker errors
+  $(package)_config_opts_linux=threadapi=pthread runtime-link=static
+  $(package)_config_opts_darwin=target-os=darwin address-model=64 runtime-link=shared
+  $(package)_config_opts_mingw32=binary-format=pe target-os=windows threadapi=win32 runtime-link=static
+  $(package)_config_opts_x86_64_mingw32=address-model=64
+  $(package)_config_opts_i686_mingw32=address-model=32
+  $(package)_config_opts_i686_linux=address-model=32 architecture=x86
+  
+  $(package)_toolset_$(host_os)=gcc
+  $(package)_archiver_$(host_os)=$($(package)_ar)
+  $(package)_toolset_darwin=darwin
+  $(package)_archiver_darwin=$($(package)_libtool)
+  
+  # CRITICAL: Added context, coroutine (for LWS) and C++17 (for Monero v18)
+  # Added 'atomic' and 'chrono' just to be safe for all platforms.
+  $(package)_config_libraries=atomic,chrono,date_time,filesystem,program_options,regex,serialization,system,thread,locale,context,coroutine
+  $(package)_cxxflags=-std=c++17 -fPIC
 endef
 
 define $(package)_preprocess_cmds
-echo "using $(boost_toolset_$(host_os)) : : $($(package)_cxx) : <cxxflags>\"$($(package)_cxxflags) $($(package)_cppflags)\" <linkflags>\"$($(package)_ldflags)\" <archiver>\"$(boost_archiver_$(host_os))\" <arflags>\"$($(package)_arflags)\" <striper>\"$(host_STRIP)\" <ranlib>\"$(host_RANLIB)\" <rc>\"$(host_WINDRES)\" : ;" > user-config.jam
+  echo "using $(boost_toolset_$(host_os)) : : $($(package)_cxx) : <cxxflags>\"$($(package)_cxxflags) $($(package)_cppflags)\" <linkflags>\"$($(package)_ldflags)\" <archiver>\"$(boost_archiver_$(host_os))\" <arflags>\"$($(package)_arflags)\" <striper>\"$(host_STRIP)\"  <ranlib>\"$(host_RANLIB)\" <rc>\"$(host_WINDRES)\" : ;" > user-config.jam
 endef
 
 define $(package)_config_cmds
-./bootstrap.sh --without-icu --with-libraries=$(boost_config_libraries)
+  ./bootstrap.sh --without-icu --with-libraries=$(boost_config_libraries)
 endef
 
 define $(package)_build_cmds
-./b2 -d2 -j2 -d1 --prefix=$($(package)_staging_prefix_dir) $($(package)_config_opts) stage
+  ./b2 -d2 -j2 -d1 --prefix=$($(package)_staging_prefix_dir) $($(package)_config_opts) stage
 endef
 
 define $(package)_stage_cmds
-./b2 -d0 -j4 --prefix=$($(package)_staging_prefix_dir) $($(package)_config_opts) install
+  ./b2 -d0 -j4 --prefix=$($(package)_staging_prefix_dir) $($(package)_config_opts) install
 endef
\ No newline at end of file