Skip to content

Commit

Permalink
Move libstdc++ exception patch to Linux stanza; try Windows as-is.
Browse files Browse the repository at this point in the history
  • Loading branch information
nat-goodspeed committed Nov 21, 2024
1 parent 178d2a3 commit 5624fd9
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
build:
strategy:
matrix:
os: [ubuntu-22.04]
os: [windows-large, ubuntu-22.04]
runs-on: ${{ matrix.os }}
steps:
- uses: secondlife/action-autobuild@v4
Expand Down
15 changes: 9 additions & 6 deletions build-cmd.sh
Original file line number Diff line number Diff line change
Expand Up @@ -50,19 +50,15 @@ apply_patch()
local patch="$1"
local path="$2"
echo "Applying $patch..."
git apply --check --reverse --directory="$path" "$patch" || git apply --directory="$path" "$patch"
git apply --check --reverse --directory="$path" "$patch" 2>/dev/null || \
git apply --directory="$path" "$patch"
}

apply_patch "../patches/libs/config/0001-Define-BOOST_ALL_NO_LIB.patch" "libs/config"
if [[ $? -ne 0 ]]
then
nl -b a libs/config/include/boost/config/user.hpp
fi
apply_patch "../patches/libs/context/0001-switch-exception-state.patch" "libs/context"
if [[ $? -ne 0 ]]
then
nl -b a libs/context/include/boost/context/fiber_fcontext.hpp
fi
apply_patch "../patches/libs/fiber/0001-DRTVWR-476-Use-WIN32_LEAN_AND_MEAN-for-each-include-.patch" "libs/fiber"
if [[ $? -ne 0 ]]
then
Expand Down Expand Up @@ -414,6 +410,13 @@ case "$AUTOBUILD_PLATFORM" in
;;

linux*)
# patch is specific to libstdc++
apply_patch "../patches/libs/context/0001-switch-exception-state.patch" "libs/context"
if [[ $? -ne 0 ]]
then
nl -b a libs/context/include/boost/context/fiber_fcontext.hpp
fi

# Force static linkage to libz by moving .sos out of the way
trap restore_sos EXIT
for solib in "${stage}"/packages/lib/debug/libz.so* "${stage}"/packages/lib/release/libz.so*; do
Expand Down

0 comments on commit 5624fd9

Please sign in to comment.