From 5b13910afc18ccbe82b2249bad616b4e14a1ced9 Mon Sep 17 00:00:00 2001 From: such-gitea Date: Wed, 28 Jan 2026 10:50:43 -0500 Subject: [PATCH] Update .gitea/workflows/build.yaml --- .gitea/workflows/build.yaml | 180 +++++++++++++++++++----------------- 1 file changed, 96 insertions(+), 84 deletions(-) diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index 60bbddd26..10c02bc7c 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -66,100 +66,112 @@ jobs: # Add new cmake to PATH echo "$(pwd)/cmake-3.28.1-linux-x86_64/bin" >> $GITHUB_PATH - - name: Sanitize Makefiles (Fix Boost Runtime Link) + - name: Sanitize Makefiles (Robust + Static Fix) run: | - # 1. RESTORE UPSTREAM FILES + # 1. RESTORE FUNCS.MK & PACKAGES.MK (Fixes syntax & missing toolchains) 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 + # Inject new deps. We use sed to replace the definition safely. sed -i 's/^packages :=.*/packages := boost openssl expat libusb hidapi protobuf libiconv sodium zeromq unbound zlib zstd/' contrib/depends/packages/packages.mk - # 3. FIX BOOST.MK (Force runtime-link=static for Darwin) - F=contrib/depends/packages/boost.mk - printf "package=boost\n" > $F - printf "\$(package)_version=1.90.0\n" >> $F - printf "\$(package)_download_path=https://archives.boost.io/release/\$(\$(package)_version)/source/\n" >> $F - printf "\$(package)_file_name=\$(package)_\$(subst .,_,\$(\$(package)_version)).tar.bz2\n" >> $F - printf "\$(package)_sha256_hash=49551aff3b22cbc5c5a9ed3dbc92f0e23ea50a0f7325b0d198b705e8ee3fc305\n" >> $F - printf "\$(package)_dependencies=libiconv\n" >> $F + # 2. GENERATE ZLIB.MK + cat <<'EOF' > contrib/depends/packages/zlib.mk + package=zlib + $(package)_version=1.3.1 + $(package)_download_path=https://zlib.net/ + $(package)_file_name=$(package)-$($(package)_version).tar.gz + $(package)_sha256_hash=9a93b2b7dfdac77ceba5a558a580e74667dd6fede4585b91eefb60f03b72df23 + define $(package)_set_vars + $(package)_config_opts=--static + endef + define $(package)_config_cmds + CHOST=${host} ./configure $($(package)_config_opts) --prefix=$($(package)_staging_prefix_dir) + endef + define $(package)_build_cmds + $(MAKE) libz.a + endef + define $(package)_stage_cmds + $(MAKE) install + endef + EOF + sed -i 's/^ /\t/' contrib/depends/packages/zlib.mk + + # 3. GENERATE ZSTD.MK + cat <<'EOF' > contrib/depends/packages/zstd.mk + package=zstd + $(package)_version=1.5.5 + $(package)_download_path=https://github.com/facebook/zstd/releases/download/v$($(package)_version)/ + $(package)_file_name=$(package)-$($(package)_version).tar.gz + $(package)_sha256_hash=9c4396cc829cfae319a6e2615202e82aad41372073482fce286fac78646d3ee4 + define $(package)_build_cmds + $(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/ + endef + EOF + sed -i 's/^ /\t/' contrib/depends/packages/zstd.mk + + # 4. GENERATE BOOST.MK + # KEY FIX: Force 'runtime-link=static' for Darwin (was shared before) + cat <<'EOF' > contrib/depends/packages/boost.mk + package=boost + $(package)_version=1.90.0 + $(package)_download_path=https://archives.boost.io/release/$($(package)_version)/source/ + $(package)_file_name=$(package)_$(subst .,_,$($(package)_version)).tar.bz2 + $(package)_sha256_hash=49551aff3b22cbc5c5a9ed3dbc92f0e23ea50a0f7325b0d198b705e8ee3fc305 + $(package)_dependencies=libiconv - printf "define \$(package)_set_vars\n" >> $F - printf "\$(package)_config_opts_release=variant=release\n" >> $F - printf "\$(package)_config_opts_debug=variant=debug\n" >> $F - printf "\$(package)_config_opts+=--layout=system --user-config=user-config.jam\n" >> $F - printf "\$(package)_config_opts+=threading=multi link=static -sNO_BZIP2=1 -sNO_ZLIB=1\n" >> $F + 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 + endef - # FIX: Force static runtime for ALL platforms to satisfy CMake Boost_USE_STATIC_RUNTIME - printf "\$(package)_config_opts_linux=threadapi=pthread runtime-link=static\n" >> $F - printf "\$(package)_config_opts_darwin=target-os=darwin runtime-link=static\n" >> $F - printf "\$(package)_config_opts_mingw32=binary-format=pe target-os=windows threadapi=win32 runtime-link=static\n" >> $F + define $(package)_preprocess_cmds + EOF - printf "\$(package)_config_opts_x86_64_mingw32=address-model=64\n" >> $F - printf "\$(package)_config_opts_i686_mingw32=address-model=32\n" >> $F - printf "\$(package)_config_opts_i686_linux=address-model=32 architecture=x86\n" >> $F - printf "\$(package)_config_opts_x86_64_darwin=address-model=64\n" >> $F - # MACOS ARM FIX - printf "\$(package)_config_opts_aarch64_darwin=address-model=64 architecture=arm binary-format=mach-o abi=aapcs\n" >> $F + # Complex line handled safely + printf '\techo "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\n' >> contrib/depends/packages/boost.mk - printf "\$(package)_toolset_\$(host_os)=gcc\n" >> $F - printf "\$(package)_archiver_\$(host_os)=\$(\$(\$(package)_ar))\n" >> $F - printf "\$(package)_toolset_darwin=darwin\n" >> $F - printf "\$(package)_archiver_darwin=\$(\$(\$(package)_libtool))\n" >> $F - printf "\$(package)_config_libraries=atomic,chrono,date_time,filesystem,program_options,regex,serialization,system,thread,locale,context,coroutine\n" >> $F - printf "\$(package)_cxxflags=-std=c++17 -fPIC\n" >> $F - printf "endef\n" >> $F - - printf "define \$(package)_preprocess_cmds\n" >> $F - printf "\techo \"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\n" >> $F - printf "endef\n" >> $F - - printf "define \$(package)_config_cmds\n" >> $F - printf "\t./bootstrap.sh --without-icu --with-libraries=\$(boost_config_libraries)\n" >> $F - printf "endef\n" >> $F - - printf "define \$(package)_build_cmds\n" >> $F - printf "\t./b2 -d2 -j2 -d1 --prefix=\$(\$(\$(package)_staging_prefix_dir)) \$(\$(\$(package)_config_opts)) stage\n" >> $F - printf "endef\n" >> $F - - printf "define \$(package)_stage_cmds\n" >> $F - printf "\t./b2 -d0 -j4 --prefix=\$(\$(\$(package)_staging_prefix_dir)) \$(\$(\$(package)_config_opts)) install\n" >> $F - printf "endef\n" >> $F - - # 4. FIX ZLIB.MK - F=contrib/depends/packages/zlib.mk - printf "package=zlib\n" > $F - printf "\$(package)_version=1.3.1\n" >> $F - printf "\$(package)_download_path=https://zlib.net/\n" >> $F - printf "\$(package)_file_name=\$(package)-\$(\$(package)_version).tar.gz\n" >> $F - printf "\$(package)_sha256_hash=9a93b2b7dfdac77ceba5a558a580e74667dd6fede4585b91eefb60f03b72df23\n" >> $F - printf "define \$(package)_set_vars\n" >> $F - printf " \$(package)_config_opts=--static\n" >> $F - printf "endef\n" >> $F - printf "define \$(package)_config_cmds\n" >> $F - printf "\tCHOST=\${host} ./configure \$(\$(package)_config_opts) --prefix=\$(\$(\$(package)_staging_prefix_dir))\n" >> $F - printf "endef\n" >> $F - printf "define \$(package)_build_cmds\n" >> $F - printf "\t\$(MAKE) libz.a\n" >> $F - printf "endef\n" >> $F - printf "define \$(package)_stage_cmds\n" >> $F - printf "\t\$(MAKE) install\n" >> $F - printf "endef\n" >> $F - - # 5. FIX ZSTD.MK - F=contrib/depends/packages/zstd.mk - printf "package=zstd\n" > $F - printf "\$(package)_version=1.5.5\n" >> $F - printf "\$(package)_download_path=https://github.com/facebook/zstd/releases/download/v\$(\$(package)_version)/\n" >> $F - printf "\$(package)_file_name=\$(package)-\$(\$(package)_version).tar.gz\n" >> $F - printf "\$(package)_sha256_hash=9c4396cc829cfae319a6e2615202e82aad41372073482fce286fac78646d3ee4\n" >> $F - printf "define \$(package)_build_cmds\n" >> $F - printf "\t\$(MAKE) -C lib libzstd.a\n" >> $F - printf "endef\n" >> $F - printf "define \$(package)_stage_cmds\n" >> $F - printf "\tcp lib/libzstd.a \$(\$(\$(package)_staging_prefix_dir))/lib/\n" >> $F - printf "\tcp lib/zstd.h \$(\$(\$(package)_staging_prefix_dir))/include/\n" >> $F - printf "endef\n" >> $F + cat <<'EOF' >> contrib/depends/packages/boost.mk + 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 + + sed -i 's/^ /\t/' contrib/depends/packages/boost.mk - name: Build Dependencies run: |