From a5a403f41fcc0b6263a90c08d76a88bcfc762dee Mon Sep 17 00:00:00 2001 From: such-gitea Date: Sat, 24 Jan 2026 21:06:17 -0500 Subject: [PATCH] Update .gitea/workflows/build.yaml --- .gitea/workflows/build.yaml | 55 ++++++++++++++++++++----------------- 1 file changed, 30 insertions(+), 25 deletions(-) diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index c6ad4ddb5..5d21a835f 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -66,12 +66,16 @@ jobs: # Add new cmake to PATH echo "$(pwd)/cmake-3.28.1-linux-x86_64/bin" >> $GITHUB_PATH - - name: Sanitize Makefiles (Byte-Perfect printf) + - name: Sanitize Makefiles (The Real Fix) run: | - # 1. FIX PACKAGES.MK - echo "packages := boost openssl expat libusb hidapi protobuf libiconv sodium zeromq unbound zlib zstd" > contrib/depends/packages/packages.mk + # 1. RESTORE FUNCS.MK (Clean slate from upstream to fix syntax errors) + curl -L -o contrib/depends/funcs.mk https://codeberg.org/wownero/wownero/raw/branch/master/contrib/depends/funcs.mk - # 2. FIX BOOST.MK (Using printf to force real TABS) + # 2. UPDATE PACKAGES.MK (Append safely, don't wipe!) + # This appends 'zlib zstd' to the 'packages :=' line, preserving 'darwin_packages'. + sed -i 's/packages :=/packages := zlib zstd/' contrib/depends/packages/packages.mk + + # 3. FIX BOOST.MK (Byte-Perfect printf to enforce TABS) F=contrib/depends/packages/boost.mk printf "package=boost\n" > $F printf "\$(package)_version=1.90.0\n" >> $F @@ -81,24 +85,25 @@ jobs: printf "\$(package)_dependencies=libiconv\n" >> $F 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 - printf " \$(package)_config_opts_linux=threadapi=pthread runtime-link=static\n" >> $F - printf " \$(package)_config_opts_darwin=target-os=darwin runtime-link=shared\n" >> $F - printf " \$(package)_config_opts_mingw32=binary-format=pe target-os=windows threadapi=win32 runtime-link=static\n" >> $F - 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 - printf " \$(package)_config_opts_aarch64_darwin=address-model=64 architecture=arm binary-format=mach-o abi=aapcs\n" >> $F - 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 "\$(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 + printf "\$(package)_config_opts_linux=threadapi=pthread runtime-link=static\n" >> $F + printf "\$(package)_config_opts_darwin=target-os=darwin runtime-link=shared\n" >> $F + printf "\$(package)_config_opts_mingw32=binary-format=pe target-os=windows threadapi=win32 runtime-link=static\n" >> $F + 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: Explicitly set architecture and ABI + printf "\$(package)_config_opts_aarch64_darwin=address-model=64 architecture=arm binary-format=mach-o abi=aapcs\n" >> $F + 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 @@ -117,7 +122,7 @@ jobs: printf "\t./b2 -d0 -j4 --prefix=\$(\$(\$(package)_staging_prefix_dir)) \$(\$(\$(package)_config_opts)) install\n" >> $F printf "endef\n" >> $F - # 3. FIX ZLIB.MK + # 4. FIX ZLIB.MK F=contrib/depends/packages/zlib.mk printf "package=zlib\n" > $F printf "\$(package)_version=1.3.1\n" >> $F @@ -125,7 +130,7 @@ jobs: 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 "\$(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 @@ -137,7 +142,7 @@ jobs: printf "\t\$(MAKE) install\n" >> $F printf "endef\n" >> $F - # 4. FIX ZSTD.MK + # 5. FIX ZSTD.MK F=contrib/depends/packages/zstd.mk printf "package=zstd\n" > $F printf "\$(package)_version=1.5.5\n" >> $F