From fe7fc3536a102e495e951526169a479478b7295d Mon Sep 17 00:00:00 2001 From: such-gitea Date: Wed, 28 Jan 2026 17:02:00 -0500 Subject: [PATCH] Update .gitea/workflows/build.yaml --- .gitea/workflows/build.yaml | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index 55bae8ad6..d7e975ed4 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -66,7 +66,7 @@ jobs: # Add new cmake to PATH echo "$(pwd)/cmake-3.28.1-linux-x86_64/bin" >> $GITHUB_PATH - - name: Sanitize Makefiles (Corrected & Verified) + - name: Sanitize Makefiles (Restore Stable + Static Fix) run: | # 1. RESTORE UPSTREAM FILES (Clean slate) curl -L -o contrib/depends/funcs.mk https://codeberg.org/wownero/wownero/raw/branch/master/contrib/depends/funcs.mk @@ -115,7 +115,7 @@ jobs: sed -i 's/^ /\t/' contrib/depends/packages/zstd.mk # 5. GENERATE BOOST.MK - # Note: We use 'runtime-link=shared' for Darwin, matching upstream defaults. + # Reverting to the logic that worked for Linux/Windows, but changing Darwin to STATIC. cat <<'EOF' > contrib/depends/packages/boost.mk package=boost $(package)_version=1.90.0 @@ -123,39 +123,52 @@ jobs: $(package)_file_name=$(package)_$(subst .,_,$($(package)_version)).tar.bz2 $(package)_sha256_hash=49551aff3b22cbc5c5a9ed3dbc92f0e23ea50a0f7325b0d198b705e8ee3fc305 $(package)_dependencies=libiconv + define $(package)_set_vars $(package)_config_opts_release=variant=release $(package)_config_opts_debug=variant=debug $(package)_config_opts+=--layout=system --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 runtime-link=shared + + # FIX: Changed from 'shared' to 'static' to satisfy CMake checks + $(package)_config_opts_darwin=target-os=darwin runtime-link=static + $(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)_config_opts_x86_64_darwin=address-model=64 $(package)_config_opts_aarch64_darwin=address-model=64 architecture=arm binary-format=mach-o abi=aapcs + $(package)_toolset_$(host_os)=gcc $(package)_archiver_$(host_os)=$($(package)_ar) $(package)_toolset_darwin=darwin $(package)_archiver_darwin=$($(package)_libtool) + $(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) : \"$($(package)_cxxflags) $($(package)_cppflags)\" \"$($(package)_ldflags)\" \"$(boost_archiver_$(host_os))\" \"$($(package)_arflags)\" \"$(host_STRIP)\" \"$(host_RANLIB)\" \"$(host_WINDRES)\" : ;" > user-config.jam endef + define $(package)_config_cmds ./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 endef + define $(package)_stage_cmds ./b2 -d0 -j4 --prefix=$($(package)_staging_prefix_dir) $($(package)_config_opts) install endef EOF + + # Fix indentation (convert 2 spaces to tab) sed -i 's/^ /\t/' contrib/depends/packages/boost.mk - name: Build Wownero Core