From a798c5f42eaf82418be61cfd317961801a070458 Mon Sep 17 00:00:00 2001 From: Bennett Goble Date: Sat, 1 Oct 2022 05:39:47 -0700 Subject: [PATCH 01/16] Add github action build --- .github/dependabot.yaml | 7 +++++++ .github/release.yaml | 18 ++++++++++++++++++ .github/workflows/build.yaml | 24 ++++++++++++++++++++++++ 3 files changed, 49 insertions(+) create mode 100644 .github/dependabot.yaml create mode 100644 .github/release.yaml create mode 100644 .github/workflows/build.yaml diff --git a/.github/dependabot.yaml b/.github/dependabot.yaml new file mode 100644 index 0000000..f54fbcd --- /dev/null +++ b/.github/dependabot.yaml @@ -0,0 +1,7 @@ +version: 2 +updates: + + - package-ecosystem: github-actions + directory: / + schedule: + interval: monthly diff --git a/.github/release.yaml b/.github/release.yaml new file mode 100644 index 0000000..0f4884c --- /dev/null +++ b/.github/release.yaml @@ -0,0 +1,18 @@ +changelog: + exclude: + labels: + - ignore-for-release + authors: + - dependabot + categories: + - title: Breaking Changes 🛠 + labels: + - semver-major + - breaking-change + - title: New Features 🎉 + labels: + - semver-minor + - enhancement + - title: Other Changes + labels: + - '*' diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml new file mode 100644 index 0000000..fbf7d96 --- /dev/null +++ b/.github/workflows/build.yaml @@ -0,0 +1,24 @@ +name: Build +on: [push] +jobs: + build: + strategy: + matrix: + os: [windows-2022, macos-11, ubuntu-22.04] + addrsize: ["64"] + include: + - os: windows-2022 + addrsize: "32" + runs-on: ${{ matrix.os }} + steps: + - uses: secondlife/action-autobuild@release/v3 + with: + addrsize: ${{ matrix.addrsize }} + release: + needs: build + runs-on: [ubuntu-latest] + if: startsWith(github.ref, 'refs/tags/v') + steps: + - uses: secondlife/action-autobuild-release@v1 + with: + public: true From 1003db3e20a41f4d9662f0902ebf6971ecb51d36 Mon Sep 17 00:00:00 2001 From: Bennett Goble Date: Sun, 16 Oct 2022 10:10:57 -0700 Subject: [PATCH 02/16] Switch to action-autobuild@v3 --- .github/workflows/build.yaml | 2 +- BuildParams | 6 ------ README.md | 6 ++++++ 3 files changed, 7 insertions(+), 7 deletions(-) delete mode 100644 BuildParams create mode 100644 README.md diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index fbf7d96..a731653 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -11,7 +11,7 @@ jobs: addrsize: "32" runs-on: ${{ matrix.os }} steps: - - uses: secondlife/action-autobuild@release/v3 + - uses: secondlife/action-autobuild@v3 with: addrsize: ${{ matrix.addrsize }} release: diff --git a/BuildParams b/BuildParams deleted file mode 100644 index db5f2fd..0000000 --- a/BuildParams +++ /dev/null @@ -1,6 +0,0 @@ -# Use Public Upload Locations -public_build = true - -# Need viewer-build-variables as well as other shared repositories -# build_variables_repository_url set in TC project hierarchy -buildscripts_shared_more_NAMEs="build_variables" diff --git a/README.md b/README.md new file mode 100644 index 0000000..f436daa --- /dev/null +++ b/README.md @@ -0,0 +1,6 @@ +# 3p-minizip-ng + +[minizip-ng][] [autobuild][] package + +[minizip-ng]: https://github.com/zlib-ng/minizip-ng +[autobuild]: https://wiki.secondlife.com/wiki/Autobuild From 55135b4b17f17a039cedbb30fb7bf753f4b6a9f2 Mon Sep 17 00:00:00 2001 From: Bennett Goble Date: Sun, 16 Oct 2022 10:11:47 -0700 Subject: [PATCH 03/16] Use github-built zlib-ng --- autobuild.xml | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/autobuild.xml b/autobuild.xml index 8fc0bcf..cc12591 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -24,9 +24,11 @@ archive hash - bf306e38bf81c6095e0967bdef6a2445 + 583da3fe476a6893fddb836c6f63ef67f0286eb4 + hash_algorithm + sha1 url - https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/87759/805718/zlib_ng-2.0.5.563838-darwin64-563838.tar.bz2 + https://github.com/secondlife/3p-zlib-ng/releases/download/v2.0.5/zlib_ng-darwin64-2.0.5.tar.zst name darwin64 @@ -36,9 +38,11 @@ archive hash - c0ac02d44409dd8c7f69a06580fa3a8c + 40be797317889dae5fefe70ad15f9c123cb24615 + hash_algorithm + sha1 url - https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/87759/805718/[placeholderforyourbuild] + https://github.com/secondlife/3p-zlib-ng/releases/download/v2.0.5/zlib_ng-linux64-2.0.5.tar.zst name linux64 @@ -48,9 +52,11 @@ archive hash - 8ffce5bd00e3d5afa8cb39b855237c4a + 2aff13b89dd85746221d8b16c1becfa7a916dc2e + hash_algorithm + sha1 url - https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/87761/805730/zlib_ng-2.0.5.563838-windows-563838.tar.bz2 + https://github.com/secondlife/3p-zlib-ng/releases/download/v2.0.5/zlib_ng-windows-2.0.5.tar.zst name windows @@ -60,16 +66,18 @@ archive hash - bd103a9129e57f7ea35886bc7750f8a6 + 024e7a08562fa3b4e981b620eed9fa181a19e348 + hash_algorithm + sha1 url - https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/87760/805729/zlib_ng-2.0.5.563838-windows64-563838.tar.bz2 + https://github.com/secondlife/3p-zlib-ng/releases/download/v2.0.5/zlib_ng-windows64-2.0.5.tar.zst name windows64 version - 2.0.5.563838 + 2.0.5 package_description From 347038426d03f09f7ba81b6af8eb86864d7c66c3 Mon Sep 17 00:00:00 2001 From: Bennett Goble Date: Sun, 16 Oct 2022 10:12:51 -0700 Subject: [PATCH 04/16] Add a few generated files to gitignore --- .gitignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 9c8f1dd..e989a53 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,8 @@ stage/ zlib-ng/WIN +minizip-ng/unzip.h +minizip-ng/zip.h minizip-ng/build *.exe *.bz2 - From 21b431aef9e9eb9afaa1b95cbc6844c9d0a88153 Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Mon, 17 Apr 2023 17:25:24 -0400 Subject: [PATCH 05/16] SL-18837: re-enable build error recognition, try C++17 --- .github/workflows/build.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index a731653..aa338f7 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -13,6 +13,7 @@ jobs: steps: - uses: secondlife/action-autobuild@v3 with: + build-variables-ref: viewer-c++17 addrsize: ${{ matrix.addrsize }} release: needs: build From f71dd881a5832c88d488e4ba6f0ed3e0ec827f53 Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Wed, 19 Apr 2023 11:21:55 -0400 Subject: [PATCH 06/16] SL-18837: Don't pass -std=c++17 to classic C compiler. --- build-cmd.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/build-cmd.sh b/build-cmd.sh index 868b2f3..e7afada 100755 --- a/build-cmd.sh +++ b/build-cmd.sh @@ -30,6 +30,9 @@ source_environment_tempfile="$stage/source_environment.sh" "$autobuild" source_environment > "$source_environment_tempfile" . "$source_environment_tempfile" +# remove_cxxstd +source "$(dirname "$AUTOBUILD_VARIABLES_FILE")/functions" + VERSION_HEADER_FILE="$MINIZLIB_SOURCE_DIR/mz.h" version=$(sed -n -E 's/#define MZ_VERSION[ ]+[(]"([0-9.]+)"[)]/\1/p' "${VERSION_HEADER_FILE}") build=${AUTOBUILD_BUILD_ID:=0} @@ -81,7 +84,7 @@ pushd "$MINIZLIB_SOURCE_DIR" rm -rf Resources/ ../Resources tests/Resources/ cmake ../${MINIZLIB_SOURCE_DIR} -GXcode \ - -DCMAKE_C_FLAGS:STRING="$opts" \ + -DCMAKE_C_FLAGS:STRING="$(remove_cxxstd $opts)" \ -DCMAKE_CXX_FLAGS:STRING="$opts" \ -DBUILD_SHARED_LIBS=OFF \ -DMZ_COMPAT=ON \ @@ -155,7 +158,7 @@ pushd "$MINIZLIB_SOURCE_DIR" fi cmake ${top}/${MINIZLIB_SOURCE_DIR} -G"Unix Makefiles" \ - -DCMAKE_C_FLAGS:STRING="$opts" \ + -DCMAKE_C_FLAGS:STRING="$(remove_cxxstd $opts)" \ -DCMAKE_CXX_FLAGS:STRING="$opts" \ -DBUILD_SHARED_LIBS=OFF \ -DMZ_COMPAT=ON \ From dd71d41d4b6d6d6ee96c66b975ad97c678a3df02 Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Wed, 19 Apr 2023 11:22:59 -0400 Subject: [PATCH 07/16] SL-18837: Don't pass -std=c++17 to classic C compiler. --- build-cmd.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/build-cmd.sh b/build-cmd.sh index e7afada..dfb0d6a 100755 --- a/build-cmd.sh +++ b/build-cmd.sh @@ -140,11 +140,11 @@ pushd "$MINIZLIB_SOURCE_DIR" export CXX=/usr/bin/g++-4.6 fi - # Prefer out of source builds - rm -rf build - mkdir -p build - pushd build - + # Prefer out of source builds + rm -rf build + mkdir -p build + pushd build + # Default target per autobuild build --address-size opts="${TARGET_OPTS:--m$AUTOBUILD_ADDRSIZE $LL_BUILD_RELEASE}" @@ -188,7 +188,7 @@ pushd "$MINIZLIB_SOURCE_DIR" mkdir -p "$stage/include/minizip-ng" cp -a ${top}/${MINIZLIB_SOURCE_DIR}/*.h "$stage/include/minizip-ng" - popd + popd ;; esac From 65d9ef84a2510973e373004ba3717036cbaed6f6 Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Fri, 12 May 2023 12:24:24 -0400 Subject: [PATCH 08/16] SL-18837: Revert to default build-variables-ref --- .github/workflows/build.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index aa338f7..a731653 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -13,7 +13,6 @@ jobs: steps: - uses: secondlife/action-autobuild@v3 with: - build-variables-ref: viewer-c++17 addrsize: ${{ matrix.addrsize }} release: needs: build From 0bd16b62641b2ba49308fb91683aba450cabd75e Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Wed, 17 May 2023 17:23:04 -0400 Subject: [PATCH 09/16] SL-18837: Update zlib-ng to release v1.2.11.zlib-ng.32fd361. --- autobuild.xml | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/autobuild.xml b/autobuild.xml index cc12591..b76b069 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -1,6 +1,5 @@ - - + installables zlib-ng @@ -24,11 +23,11 @@ archive hash - 583da3fe476a6893fddb836c6f63ef67f0286eb4 + dacc5f3fb307c4d1292ed1ffb1d595d83599062d hash_algorithm sha1 url - https://github.com/secondlife/3p-zlib-ng/releases/download/v2.0.5/zlib_ng-darwin64-2.0.5.tar.zst + 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 name darwin64 @@ -38,11 +37,11 @@ archive hash - 40be797317889dae5fefe70ad15f9c123cb24615 + fba88375e12454ae19f4528e11ffc7ddf7d879ec hash_algorithm sha1 url - https://github.com/secondlife/3p-zlib-ng/releases/download/v2.0.5/zlib_ng-linux64-2.0.5.tar.zst + 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 name linux64 @@ -52,11 +51,11 @@ archive hash - 2aff13b89dd85746221d8b16c1becfa7a916dc2e + 2b5a50b0a3d31a07bc74cb77871ad195eb97c550 hash_algorithm sha1 url - https://github.com/secondlife/3p-zlib-ng/releases/download/v2.0.5/zlib_ng-windows-2.0.5.tar.zst + https://github.com/secondlife/3p-zlib-ng/releases/download/v1.2.11.zlib-ng.32fd361/zlib_ng-1.2.11.zlib-ng.32fd361-windows-32fd361.tar.zst name windows @@ -66,18 +65,18 @@ archive hash - 024e7a08562fa3b4e981b620eed9fa181a19e348 + ccfca9451063e2d0e95baa73b1ad2054d3e38907 hash_algorithm sha1 url - https://github.com/secondlife/3p-zlib-ng/releases/download/v2.0.5/zlib_ng-windows64-2.0.5.tar.zst + 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 name windows64 version - 2.0.5 + 1.2.11.zlib-ng.32fd361 package_description @@ -201,5 +200,4 @@ autobuild version 1.3 - - + From 193a7d6b0a0ade183f37fee1ee02a2a06d496a0d Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Thu, 18 May 2023 10:33:50 -0400 Subject: [PATCH 10/16] SL-18837: Use 32-bit arch on Windows32. --- build-cmd.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-cmd.sh b/build-cmd.sh index dfb0d6a..fe8430c 100755 --- a/build-cmd.sh +++ b/build-cmd.sh @@ -45,7 +45,7 @@ pushd "$MINIZLIB_SOURCE_DIR" windows*) load_vsvars - cmake -G "$AUTOBUILD_WIN_CMAKE_GEN" . \ + cmake -G "$AUTOBUILD_WIN_CMAKE_GEN" -A "$AUTOBUILD_WIN_VSPLATFORM" . \ -DBUILD_SHARED_LIBS=OFF \ -DMZ_COMPAT=ON \ -DMZ_BUILD_TEST=ON \ From 372f4f047abed6d1275243d0f08741719508ca37 Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Thu, 18 May 2023 11:12:29 -0400 Subject: [PATCH 11/16] SL-18837: Don't use cygpath on macOS --- build-cmd.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build-cmd.sh b/build-cmd.sh index fe8430c..572a659 100755 --- a/build-cmd.sh +++ b/build-cmd.sh @@ -99,8 +99,8 @@ pushd "$MINIZLIB_SOURCE_DIR" -DMZ_WZAES=OFF \ -DMZ_LIBCOMP=OFF \ -DCMAKE_INSTALL_PREFIX=$stage \ - -DZLIB_INCLUDE_DIRS="$(cygpath -m $stage)/packages/include/zlib-ng/" \ - -DZLIB_LIBRARIES="$(cygpath -m $stage)/packages/lib/release/libz.a" + -DZLIB_INCLUDE_DIRS="$stage/packages/include/zlib-ng/" \ + -DZLIB_LIBRARIES="$stage/packages/lib/release/libz.a" cmake --build . --config Release From c95c579166abbc3de21fde991f7afc8b8673ce95 Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Thu, 18 May 2023 11:55:31 -0400 Subject: [PATCH 12/16] SL-18837: Try explicitly setting macOS clang -target. --- build-cmd.sh | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/build-cmd.sh b/build-cmd.sh index 572a659..181685d 100755 --- a/build-cmd.sh +++ b/build-cmd.sh @@ -80,6 +80,18 @@ pushd "$MINIZLIB_SOURCE_DIR" opts="${TARGET_OPTS:--arch $AUTOBUILD_CONFIGURE_ARCH $LL_BUILD_RELEASE}" + # As of version 3.0.2 (2023-05-18), we get: + # clang: warning: overriding '-mmacosx-version-min=10.13' option + # with '-target x86_64-apple-macos11.7' [-Woverriding-t-option] + # We didn't specify -target explicitly before; try setting it. + # (_find and _test_re from build-variables/functions script) + if idx=$(_find _test_re "-mmacosx-version-min=.*" "$opts") + then + versw="${opts[$idx]}" + minver="${versw%*=}" + opts+=(-target "x86_64-apple-macos$minver") + fi + mkdir -p "$stage/lib/release" rm -rf Resources/ ../Resources tests/Resources/ From d16771516c8f97f2b1a757c6714d323e48843554 Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Thu, 18 May 2023 14:38:28 -0400 Subject: [PATCH 13/16] SL-18837: Try harder to set macOS clang -target. --- build-cmd.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-cmd.sh b/build-cmd.sh index 181685d..38a6ea1 100755 --- a/build-cmd.sh +++ b/build-cmd.sh @@ -85,7 +85,7 @@ pushd "$MINIZLIB_SOURCE_DIR" # with '-target x86_64-apple-macos11.7' [-Woverriding-t-option] # We didn't specify -target explicitly before; try setting it. # (_find and _test_re from build-variables/functions script) - if idx=$(_find _test_re "-mmacosx-version-min=.*" "$opts") + if idx=$(_find _test_re "-mmacosx-version-min=.*" $opts) then versw="${opts[$idx]}" minver="${versw%*=}" From 182d5105f01b63901c3606d830a443be90f6cc75 Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Thu, 18 May 2023 14:44:27 -0400 Subject: [PATCH 14/16] SL-18837: Try even harder to set macOS clang -target. --- build-cmd.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/build-cmd.sh b/build-cmd.sh index 38a6ea1..2aedda8 100755 --- a/build-cmd.sh +++ b/build-cmd.sh @@ -87,9 +87,11 @@ pushd "$MINIZLIB_SOURCE_DIR" # (_find and _test_re from build-variables/functions script) if idx=$(_find _test_re "-mmacosx-version-min=.*" $opts) then - versw="${opts[$idx]}" + optarray=($opts) + versw="${optarray[$idx]}" minver="${versw%*=}" - opts+=(-target "x86_64-apple-macos$minver") + optarray+=(-target "x86_64-apple-macos$minver") + opts="${optarray[*]}" fi mkdir -p "$stage/lib/release" From 298f1f2156845f18df87062aa2a8743e1c8155a7 Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Thu, 18 May 2023 14:49:15 -0400 Subject: [PATCH 15/16] SL-18837: Try yet harder to set macOS clang -target. --- build-cmd.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-cmd.sh b/build-cmd.sh index 2aedda8..a6be359 100755 --- a/build-cmd.sh +++ b/build-cmd.sh @@ -89,7 +89,7 @@ pushd "$MINIZLIB_SOURCE_DIR" then optarray=($opts) versw="${optarray[$idx]}" - minver="${versw%*=}" + minver="${versw#*=}" optarray+=(-target "x86_64-apple-macos$minver") opts="${optarray[*]}" fi From 3e9876ef6432334711ca51625bcdb24de7a805ed Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Fri, 2 Jun 2023 11:42:09 -0400 Subject: [PATCH 16/16] SL-18837: Turn off minizip options causing colladadom link errors. Specifically, turn off MZ_ZSTD and MZ_ICONV: we don't have (and don't want to add) the third-party libraries to support those. Unify the minizip configuration options for all platforms so we don't have to maintain them in three different places. --- build-cmd.sh | 57 +++++++++++++++++++++------------------------------- 1 file changed, 23 insertions(+), 34 deletions(-) diff --git a/build-cmd.sh b/build-cmd.sh index a6be359..f845cce 100755 --- a/build-cmd.sh +++ b/build-cmd.sh @@ -38,6 +38,24 @@ version=$(sed -n -E 's/#define MZ_VERSION[ ]+[(]"([0-9.]+)"[)]/\1/p' "${VERSION_ build=${AUTOBUILD_BUILD_ID:=0} echo "${version}.${build}" > "${stage}/VERSION.txt" +# CMake configuration options for all platforms +config=( \ + -DBUILD_SHARED_LIBS=OFF \ + -DMZ_BUILD_TESTS=ON \ + -DMZ_BZIP2=OFF \ + -DMZ_COMPAT=ON \ + -DMZ_FETCH_LIBS=OFF \ + -DMZ_ICONV=OFF \ + -DMZ_LIBBSD=OFF \ + -DMZ_LIBCOMP=OFF \ + -DMZ_LZMA=OFF \ + -DMZ_OPENSSL=OFF \ + -DMZ_PKCRYPT=OFF \ + -DMZ_SIGNING=OFF \ + -DMZ_WZAES=OFF \ + -DMZ_ZSTD=OFF \ + ) + pushd "$MINIZLIB_SOURCE_DIR" case "$AUTOBUILD_PLATFORM" in @@ -46,17 +64,9 @@ pushd "$MINIZLIB_SOURCE_DIR" load_vsvars cmake -G "$AUTOBUILD_WIN_CMAKE_GEN" -A "$AUTOBUILD_WIN_VSPLATFORM" . \ - -DBUILD_SHARED_LIBS=OFF \ - -DMZ_COMPAT=ON \ - -DMZ_BUILD_TEST=ON \ - -DMZ_FETCH_LIBS=OFF\ - -DMZ_BZIP2=OFF \ - -DMZ_LIBBSD=OFF \ - -DMZ_LZMA=OFF \ - -DMZ_OPENSSL=OFF \ - -DMZ_PKCRYPT=OFF \ - -DMZ_SIGNING=OFF \ - -DMZ_WZAES=OFF \ + -DCMAKE_C_FLAGS:STRING="$LL_BUILD_RELEASE" \ + -DCMAKE_CXX_FLAGS:STRING="$LL_BUILD_RELEASE" \ + "${config[@]}" \ -DZLIB_INCLUDE_DIRS="$(cygpath -m $stage)/packages/include/zlib-ng/" \ -DZLIB_LIBRARIES="$(cygpath -m $stage)/packages/lib/release/zlib.lib" @@ -100,18 +110,7 @@ pushd "$MINIZLIB_SOURCE_DIR" cmake ../${MINIZLIB_SOURCE_DIR} -GXcode \ -DCMAKE_C_FLAGS:STRING="$(remove_cxxstd $opts)" \ -DCMAKE_CXX_FLAGS:STRING="$opts" \ - -DBUILD_SHARED_LIBS=OFF \ - -DMZ_COMPAT=ON \ - -DMZ_BUILD_TEST=ON \ - -DMZ_FETCH_LIBS=OFF \ - -DMZ_BZIP2=OFF \ - -DMZ_LIBBSD=OFF \ - -DMZ_LZMA=OFF \ - -DMZ_OPENSSL=OFF \ - -DMZ_PKCRYPT=OFF \ - -DMZ_SIGNING=OFF \ - -DMZ_WZAES=OFF \ - -DMZ_LIBCOMP=OFF \ + "${config[@]}" \ -DCMAKE_INSTALL_PREFIX=$stage \ -DZLIB_INCLUDE_DIRS="$stage/packages/include/zlib-ng/" \ -DZLIB_LIBRARIES="$stage/packages/lib/release/libz.a" @@ -174,17 +173,7 @@ pushd "$MINIZLIB_SOURCE_DIR" cmake ${top}/${MINIZLIB_SOURCE_DIR} -G"Unix Makefiles" \ -DCMAKE_C_FLAGS:STRING="$(remove_cxxstd $opts)" \ -DCMAKE_CXX_FLAGS:STRING="$opts" \ - -DBUILD_SHARED_LIBS=OFF \ - -DMZ_COMPAT=ON \ - -DMZ_BUILD_TEST=ON \ - -DMZ_FETCH_LIBS=OFF \ - -DMZ_BZIP2=OFF \ - -DMZ_LIBBSD=OFF \ - -DMZ_LZMA=OFF \ - -DMZ_OPENSSL=OFF \ - -DMZ_PKCRYPT=OFF \ - -DMZ_SIGNING=OFF \ - -DMZ_WZAES=OFF \ + "${config[@]}" \ -DCMAKE_INSTALL_PREFIX=$stage \ -DZLIB_INCLUDE_DIRS="$stage/packages/include/zlib-ng/" \ -DZLIB_LIBRARIES="$stage/packages/lib/release/libz.a"