Skip to content

Commit

Permalink
Update to zlib-ng 2.2.1-r2 and fix up windows symbol generation (#10)
Browse files Browse the repository at this point in the history
* Update to zlib-ng 2.2.1-r2

* Fix windows build and debug flags
  • Loading branch information
RyeMutt authored Aug 10, 2024
1 parent d34b6b4 commit a65a4d7
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 20 deletions.
11 changes: 1 addition & 10 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,7 @@ jobs:
os: [windows-large, macos-13-large, ubuntu-22.04]
runs-on: ${{ matrix.os }}
steps:
- name: Disable autocrlf
shell: bash
if: runner.os == 'Windows'
run: git config --global core.autocrlf input
- uses: actions/checkout@v4
with:
submodules: recursive
- uses: secondlife/action-autobuild@v3
with:
checkout: false
- uses: secondlife/action-autobuild@v4
release:
needs: build
runs-on: [ubuntu-latest]
Expand Down
14 changes: 7 additions & 7 deletions autobuild.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@
<key>archive</key>
<map>
<key>hash</key>
<string>dacc5f3fb307c4d1292ed1ffb1d595d83599062d</string>
<string>3a6593c71c59ace76d1349483759fcde4b719a76</string>
<key>hash_algorithm</key>
<string>sha1</string>
<key>url</key>
<string>https://github.com/secondlife/3p-zlib-ng/releases/download/v1.2.11.zlib-ng.32fd361/zlib_ng-1.2.11.zlib-ng.32fd361-darwin64-32fd361.tar.zst</string>
<string>https://github.com/secondlife/3p-zlib-ng/releases/download/v2.2.1-r2/zlib_ng-2.2.1-r2-darwin64-10324415171.tar.zst</string>
</map>
<key>name</key>
<string>darwin64</string>
Expand All @@ -30,11 +30,11 @@
<key>archive</key>
<map>
<key>hash</key>
<string>fba88375e12454ae19f4528e11ffc7ddf7d879ec</string>
<string>fbadeb0b8c771cb06c0055c9fab6d40c6764dacd</string>
<key>hash_algorithm</key>
<string>sha1</string>
<key>url</key>
<string>https://github.com/secondlife/3p-zlib-ng/releases/download/v1.2.11.zlib-ng.32fd361/zlib_ng-1.2.11.zlib-ng.32fd361-linux64-32fd361.tar.zst</string>
<string>https://github.com/secondlife/3p-zlib-ng/releases/download/v2.2.1-r2/zlib_ng-2.2.1-r2-linux64-10324415171.tar.zst</string>
</map>
<key>name</key>
<string>linux64</string>
Expand All @@ -58,11 +58,11 @@
<key>archive</key>
<map>
<key>hash</key>
<string>ccfca9451063e2d0e95baa73b1ad2054d3e38907</string>
<string>0094031715662be626f5106ff6c814f4fc3dacfa</string>
<key>hash_algorithm</key>
<string>sha1</string>
<key>url</key>
<string>https://github.com/secondlife/3p-zlib-ng/releases/download/v1.2.11.zlib-ng.32fd361/zlib_ng-1.2.11.zlib-ng.32fd361-windows64-32fd361.tar.zst</string>
<string>https://github.com/secondlife/3p-zlib-ng/releases/download/v2.2.1-r2/zlib_ng-2.2.1-r2-windows64-10324415171.tar.zst</string>
</map>
<key>name</key>
<string>windows64</string>
Expand All @@ -75,7 +75,7 @@
<key>copyright</key>
<string>Copyright (C) 1995-2013 Jean-loup Gailly and Mark Adler</string>
<key>version</key>
<string>1.2.11.zlib-ng.32fd361</string>
<string>2.2.1-r2</string>
<key>name</key>
<string>zlib-ng</string>
<key>canonical_repo</key>
Expand Down
19 changes: 16 additions & 3 deletions build-cmd.sh
Original file line number Diff line number Diff line change
Expand Up @@ -50,13 +50,13 @@ 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 --directory="$path" "$patch" || git apply --directory="$path" "$patch"
}

apply_patch "../patches/libs/config/0001-Define-BOOST_ALL_NO_LIB.patch" "libs/config"
apply_patch "../patches/libs/fiber/0001-DRTVWR-476-Use-WIN32_LEAN_AND_MEAN-for-each-include-.patch" "libs/fiber"

if [ "$OSTYPE" = "cygwin" ] ; then
if [[ "$OSTYPE" == "cygwin" || "$OSTYPE" == "msys" ]] ; then
autobuild="$(cygpath -u $AUTOBUILD)"
# convert from bash path to native OS pathname
native()
Expand Down Expand Up @@ -87,7 +87,17 @@ BOOST_BJAM_OPTIONS="address-model=$AUTOBUILD_ADDRSIZE architecture=x86 --layout=
# we're about to add) go into a single array entry.
BOOST_BJAM_OPTIONS=($BOOST_BJAM_OPTIONS)
# Append cxxflags as a single entry containing all of LL_BUILD_RELEASE.
BOOST_BJAM_OPTIONS+=("cxxflags=$LL_BUILD_RELEASE")

case "$AUTOBUILD_PLATFORM" in
windows*)
BOOST_BJAM_OPTIONS+=("cxxflags=$(replace_switch /Zi /Z7 $LL_BUILD_RELEASE)")
;;
*)
BOOST_BJAM_OPTIONS+=("cxxflags=$LL_BUILD_RELEASE")
;;
esac



stage_lib="${stage}"/lib
stage_release="${stage_lib}"/release
Expand Down Expand Up @@ -335,6 +345,9 @@ case "$AUTOBUILD_PLATFORM" in
;;

darwin*)
# deploy target
export MACOSX_DEPLOYMENT_TARGET=${LL_BUILD_DARWIN_DEPLOY_TARGET}

# Force zlib static linkage by moving .dylibs out of the way
trap restore_dylibs EXIT
for dylib in "${stage}"/packages/lib/{debug,release}/*.dylib; do
Expand Down

0 comments on commit a65a4d7

Please sign in to comment.