diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index 6275081..f2cb97e 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -114,36 +114,39 @@ jobs: git config --global url."https://github.com/".insteadOf "git@github.com:" git submodule update --init --recursive - # --- 1. CLEANUP: Nuke Cache & Bad Downloads --- - - name: Nuke Old Boost Cache & Downloads + # --- 1. CLEANUP --- + - name: Nuke Old Boost Cache run: | - echo "Deleting cached Boost build and downloads..." 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* - # --- 2. UPGRADE BOOST (The "Simple & Robust" Way) --- + # --- 2. UPGRADE BOOST (The Triple-Tap Fix) --- - name: Upgrade Boost Version to 1.80.0 run: | echo "Forcing depends to use Boost 1.80.0..." BOOST_MK="external/monero/contrib/depends/packages/boost.mk" - # 1. Update Version Numbers (Handle both formats) + # 1. Update Version and Hash sed -i 's/1_69_0/1_80_0/g' $BOOST_MK sed -i 's/1.69.0/1.80.0/g' $BOOST_MK - - # 2. Update Hash (For boost_1_80_0.tar.gz) sed -i 's/sha256_hash=.*$/sha256_hash=4b2136f98bdd1f5857f1c3dea9ac2018effe65286cf251534b6ae20cc45e1847/g' $BOOST_MK - # 3. DELETE PATCHES (The Fix: Delete ANY line with "_patches" in it) - # This works better than trying to match the variable name - sed -i '/_patches/d' $BOOST_MK - - # 4. Add Context/Coroutine libraries + # 2. Add Libraries sed -i 's/chrono,/chrono,context,coroutine,/g' $BOOST_MK + + # 3. KILL PATCHES (Triple Defense) + # A. Try to delete the line + sed -i '/patches/d' $BOOST_MK - # Debug: Verify the file content - echo "--- MODIFIED BOOST.MK ---" + # B. Append an empty variable definition to the end (Overrides anything above) + echo "package_patches=" >> $BOOST_MK + + # C. TRICK: Overwrite the actual patch file with an empty file + # If the build system insists on finding this file, we give it a blank one. + echo "" > external/monero/contrib/depends/packages/boost/fix_aroptions.patch + + # Debug cat $BOOST_MK # --- 3. BUILD DEPENDENCIES ---