From 5d4e58d7187ff639598176cff69efa4bbd79e8c0 Mon Sep 17 00:00:00 2001 From: such-gitea Date: Wed, 7 Jan 2026 09:48:48 -0800 Subject: [PATCH] Update .gitea/workflows/build.yaml --- .gitea/workflows/build.yaml | 40 ++++++++++++++++++++++++------------- 1 file changed, 26 insertions(+), 14 deletions(-) diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index ec73288..c8e3b0b 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -114,22 +114,34 @@ jobs: git config --global url."https://github.com/".insteadOf "git@github.com:" git submodule update --init --recursive - # --- 1. CLEANUP (Standard) --- + # --- 1. CLEANUP --- - name: Clean Environment run: | echo "Cleaning build environment..." rm -rf external/monero/contrib/depends/work/build/x86_64-w64-mingw32/boost rm -rf external/monero/contrib/depends/built/x86_64-w64-mingw32/boost rm -rf external/monero/contrib/depends/work/download/boost* - # Just in case + # Delete the patch directory to prevent "Is a directory" errors rm -rf external/monero/contrib/depends/packages/boost - # --- 2. THE ROOT CANAL FIX --- - - name: Configure Boost 1.80.0 & Disable Patching Engine + # --- 2. DISABLE PATCHING ENGINE (The "True" Fix) --- + - name: Disable Patch System run: | - echo "Configuring Boost 1.80.0..." - BOOST_MK="external/monero/contrib/depends/packages/boost.mk" FUNCS_MK="external/monero/contrib/depends/funcs.mk" + echo "Neutering the patch function in $FUNCS_MK..." + + # We search for the patch command and replace it with 'true'. + # 'true' always returns exit code 0 and does nothing. + # We accept failure (|| true) in sed just in case, to prevent the step from crashing. + sed -i 's/patch -p1/true/g' $FUNCS_MK || true + + # SAFETY NET: Just in case it's using a variable like $(PATCH) + sed -i 's/$(PATCH) -p1/true/g' $FUNCS_MK || true + + # --- 3. CONFIGURE BOOST 1.80 --- + - name: Configure Boost 1.80.0 + run: | + BOOST_MK="external/monero/contrib/depends/packages/boost.mk" # 1. Update Version and Hash sed -i 's/1_69_0/1_80_0/g' $BOOST_MK @@ -139,14 +151,14 @@ jobs: # 2. Add Context/Coroutine libraries sed -i 's/chrono,/chrono,context,coroutine,/g' $BOOST_MK - # 3. SURGICALLY DISABLE PATCHING IN FUNCS.MK - # We look for the line that says 'patch -p1 ...' and comment it out. - # This disables patching for ALL packages, ensuring 100% clean vanilla builds. - echo "Disabling patch system in funcs.mk..." - sed -i 's/patch -p1/# patch -p1/g' $FUNCS_MK - - # Debug: Verify the surgery - grep "patch -p1" $FUNCS_MK + # 3. CLEAR PATCH LIST (Variable Nuke) + # We append an empty definition at the end. In Make, the last definition wins. + echo "" >> $BOOST_MK + echo "package_patches=" >> $BOOST_MK + echo "$(package)_patches=" >> $BOOST_MK + + # Debug check + tail -n 5 $BOOST_MK # --- 3. BUILD DEPENDENCIES --- - name: Build Windows Dependencies