diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index bdd754d..9fa1b85 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -121,32 +121,32 @@ jobs: 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* - # Remove the patch directory entirely so no files can be found by accident + # Delete the patch directory so there is zero confusion rm -rf external/monero/contrib/depends/packages/boost - # --- 2. UPGRADE BOOST & DISABLE PATCHES (The Variable Nuke) --- + # --- 2. UPGRADE BOOST & REMOVE PATCHES (The "Grep -v" Method) --- - name: Configure Boost 1.80.0 run: | - echo "Modifying boost.mk..." + echo "Configuring Boost 1.80.0..." BOOST_MK="external/monero/contrib/depends/packages/boost.mk" - # 1. Update Version and Hash (Standard Fix) + # 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 sed -i 's/sha256_hash=.*$/sha256_hash=4b2136f98bdd1f5857f1c3dea9ac2018effe65286cf251534b6ae20cc45e1847/g' $BOOST_MK - # 2. Add Context/Coroutine libraries (Standard Fix) + # 2. Add Context/Coroutine libraries sed -i 's/chrono,/chrono,context,coroutine,/g' $BOOST_MK - # 3. NUKE THE PATCH LIST (The Logic Fix) - # We look for any line containing "_patches" and an "=" sign. - # We replace the ENTIRE LINE with an empty variable declaration. - # This forces Make to believe there are zero patches to apply. - sed -i 's/^.*_patches.*=.*$/$(package)_patches=/' $BOOST_MK + # 3. NUKE PATCHES (The Robust Fix) + # We read the file, filter out ANY line with the word "patches", and write it back. + # This guarantees the variable definition is GONE. + grep -v "patches" $BOOST_MK > boost_clean.mk + mv boost_clean.mk $BOOST_MK - # Debug: Verify the file looks correct (Look for the empty patches line) - echo "--- Verifying boost.mk content ---" - cat $BOOST_MK + # Debug: Verify content (There should be no output from this grep) + echo "--- Checking for leftover patches... ---" + grep "patches" $BOOST_MK || echo "Confirmed: No patches found in Makefile." # --- 3. BUILD DEPENDENCIES --- - name: Build Windows Dependencies