From 822f993cc9fcd40efef8165760066240050b53c7 Mon Sep 17 00:00:00 2001 From: such-gitea Date: Wed, 28 Jan 2026 16:54:13 -0500 Subject: [PATCH] Update .gitea/workflows/build.yaml --- .gitea/workflows/build.yaml | 67 +++++++++++++++++-------------------- 1 file changed, 30 insertions(+), 37 deletions(-) diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index 7278af3a6..55bae8ad6 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -66,13 +66,13 @@ jobs: # Add new cmake to PATH echo "$(pwd)/cmake-3.28.1-linux-x86_64/bin" >> $GITHUB_PATH - - name: Sanitize Makefiles (Final Fix) + - name: Sanitize Makefiles (Corrected & Verified) run: | - # 1. RESTORE UPSTREAM FILES + # 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 curl -L -o contrib/depends/packages/packages.mk https://codeberg.org/wownero/wownero/raw/branch/master/contrib/depends/packages/packages.mk - # 2. INJECT ZLIB/ZSTD (Safe Replace) + # 2. INJECT ZLIB/ZSTD (Safe append) sed -i 's/^packages :=.*/packages := boost openssl expat libusb hidapi protobuf libiconv sodium zeromq unbound zlib zstd/' contrib/depends/packages/packages.mk # 3. GENERATE ZLIB.MK @@ -83,16 +83,16 @@ jobs: $(package)_file_name=$(package)-$($(package)_version).tar.gz $(package)_sha256_hash=9a93b2b7dfdac77ceba5a558a580e74667dd6fede4585b91eefb60f03b72df23 define $(package)_set_vars - $(package)_config_opts=--static + $(package)_config_opts=--static endef define $(package)_config_cmds - CHOST=${host} ./configure $($(package)_config_opts) --prefix=$($(package)_staging_prefix_dir) + CHOST=${host} ./configure $($(package)_config_opts) --prefix=$($(package)_staging_prefix_dir) endef define $(package)_build_cmds - $(MAKE) libz.a + $(MAKE) libz.a endef define $(package)_stage_cmds - $(MAKE) install + $(MAKE) install endef EOF sed -i 's/^ /\t/' contrib/depends/packages/zlib.mk @@ -105,16 +105,17 @@ jobs: $(package)_file_name=$(package)-$($(package)_version).tar.gz $(package)_sha256_hash=9c4396cc829cfae319a6e2615202e82aad41372073482fce286fac78646d3ee4 define $(package)_build_cmds - $(MAKE) -C lib libzstd.a + $(MAKE) -C lib libzstd.a endef define $(package)_stage_cmds - cp lib/libzstd.a $($(package)_staging_prefix_dir)/lib/ - cp lib/zstd.h $($(package)_staging_prefix_dir)/include/ + cp lib/libzstd.a $($(package)_staging_prefix_dir)/lib/ + cp lib/zstd.h $($(package)_staging_prefix_dir)/include/ endef EOF sed -i 's/^ /\t/' contrib/depends/packages/zstd.mk - # 5. GENERATE BOOST.MK (FLUSH LEFT, NO INDENT) + # 5. GENERATE BOOST.MK + # Note: We use 'runtime-link=shared' for Darwin, matching upstream defaults. cat <<'EOF' > contrib/depends/packages/boost.mk package=boost $(package)_version=1.90.0 @@ -123,24 +124,24 @@ jobs: $(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=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 + $(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 + $(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 @@ -155,16 +156,8 @@ jobs: ./b2 -d0 -j4 --prefix=$($(package)_staging_prefix_dir) $($(package)_config_opts) install endef EOF - - # Fix indentation for the cat blocks (convert 2 spaces to tab) sed -i 's/^ /\t/' contrib/depends/packages/boost.mk - - name: Build Dependencies - run: | - cd contrib/depends - # This builds Boost 1.90.0 using your updated boost.mk - make HOST=${{ matrix.target }} -j$(nproc) - - name: Build Wownero Core run: | PREFIX=$(pwd)/contrib/depends/${{ matrix.target }}