diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index 8167c6a..e5ce295 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -1,4 +1,4 @@ -name: Build Wownero LWS (Mac Fix / Win Disabled) +name: Build Wownero LWS (Mac RT Fix) on: push: branches: [ master, main ] @@ -154,8 +154,6 @@ jobs: find . -name "libhidapi*.a" -exec cp -n {} libhidapi.a \; || true find . -name "libzstd*.a" -exec cp -n {} libzstd.a \; || true find . -name "libz*.a" ! -name "*zmq*" -exec cp -n {} libz.a \; || true - - # Symlink Cross RT SYSROOT_RT=$(find ${{ matrix.sysroot }} -name "librt.a" 2>/dev/null | head -n 1) if [ -n "$SYSROOT_RT" ]; then ln -s "$SYSROOT_RT" librt.a @@ -163,31 +161,21 @@ jobs: FALLBACK=$(find /usr -name "librt.a" | grep ${{ matrix.proc }} | head -n 1) if [ -n "$FALLBACK" ]; then ln -s "$FALLBACK" librt.a; fi fi - - # Patch Boost Context (Aarch64) - USING CORRECT URL - name: Patch Boost Context (Aarch64) if: matrix.target == 'aarch64-linux-gnu' run: | echo "Downloading and compiling missing Boost Context ASM for aarch64..." mkdir -p boost_asm && cd boost_asm - - # Use 'develop' branch to avoid 404 BASE="https://raw.githubusercontent.com/boostorg/context/develop/src/asm" - curl -f -O $BASE/jump_arm64_aapcs_elf_gas.S curl -f -O $BASE/make_arm64_aapcs_elf_gas.S curl -f -O $BASE/ontop_arm64_aapcs_elf_gas.S - if [ ! -s jump_arm64_aapcs_elf_gas.S ]; then echo "FATAL: Empty file downloaded"; exit 1; fi - aarch64-linux-gnu-gcc -c jump_arm64_aapcs_elf_gas.S -o jump.o aarch64-linux-gnu-gcc -c make_arm64_aapcs_elf_gas.S -o make.o aarch64-linux-gnu-gcc -c ontop_arm64_aapcs_elf_gas.S -o ontop.o - aarch64-linux-gnu-ar r /opt/wownero-sdk/lib/libboost_context.a jump.o make.o ontop.o aarch64-linux-gnu-ar s /opt/wownero-sdk/lib/libboost_context.a - echo "Patch applied successfully." - - name: Install Modern CMake run: | curl -L -o cmake.tar.gz https://github.com/Kitware/CMake/releases/download/v3.28.1/cmake-3.28.1-linux-x86_64.tar.gz @@ -239,7 +227,7 @@ jobs: -DLIBEVENT_INCLUDE_DIR=$SDK_DIR/include \ -DRT_LIBRARY=rt \ -DUSE_READLINE=OFF \ - -DCMAKE_EXE_LINKER_FLAGS="-static -Wl,--allow-multiple-definition" + -DCMAKE_EXE_LINKER_FLAGS="-static -Wl,--allow-multiple-definition" make -j$(nproc) - name: Package run: | @@ -259,7 +247,7 @@ jobs: # ... # ================================================================== - # JOB 4: MACOS - RESTORED & FIXED + # JOB 4: MACOS - RT FIX # ================================================================== macos: runs-on: macos-latest @@ -310,6 +298,7 @@ jobs: mkdir build && cd build SDK_DIR="$(pwd)/../wownero-sdk" + # FIX: REMOVED -DRT_LIBRARY=rt (MacOS uses libc) cmake .. -DCMAKE_BUILD_TYPE=Release \ -DBUILD_STATIC=ON \ -DBoost_USE_STATIC_RUNTIME=OFF \