From ad3435235f9f3a72cc29ec5964780455299b60d0 Mon Sep 17 00:00:00 2001 From: Ankur Verma <31362771+ankurvdev@users.noreply.github.com> Date: Tue, 7 Feb 2023 15:00:51 -0800 Subject: [PATCH] [brotli] Fix wasm32-emscripten build (#29349) * Update portfile.cmake * Update port-version * Update version --------- Co-authored-by: Billy Robert O'Neal III --- ports/brotli/portfile.cmake | 2 ++ ports/brotli/vcpkg.json | 2 +- versions/b-/brotli.json | 5 +++++ versions/baseline.json | 2 +- 4 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ports/brotli/portfile.cmake b/ports/brotli/portfile.cmake index 2b46cae789..9c74dc6c8d 100644 --- a/ports/brotli/portfile.cmake +++ b/ports/brotli/portfile.cmake @@ -14,6 +14,8 @@ vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DBROTLI_DISABLE_TESTS=ON + # Required for wasm32-emscripten triplet to avoid "install" being turned off + -DBROTLI_EMSCRIPTEN=OFF ) vcpkg_cmake_install() vcpkg_copy_pdbs() diff --git a/ports/brotli/vcpkg.json b/ports/brotli/vcpkg.json index 717f110418..e352eea247 100644 --- a/ports/brotli/vcpkg.json +++ b/ports/brotli/vcpkg.json @@ -1,7 +1,7 @@ { "name": "brotli", "version": "1.0.9", - "port-version": 4, + "port-version": 5, "description": "a generic-purpose lossless compression algorithm that compresses data using a combination of a modern variant of the LZ77 algorithm, Huffman coding and 2nd order context modeling.", "homepage": "https://github.com/google/brotli", "license": "MIT", diff --git a/versions/b-/brotli.json b/versions/b-/brotli.json index 1e5a7a4a9c..cc5a71320e 100644 --- a/versions/b-/brotli.json +++ b/versions/b-/brotli.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "32ea6c4b0d18fa3172ad52147599983acc71d748", + "version": "1.0.9", + "port-version": 5 + }, { "git-tree": "e6838ab1a2b10d47924875dd1f71c47d45c01bb6", "version": "1.0.9", diff --git a/versions/baseline.json b/versions/baseline.json index 60d53d4487..1973e99369 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1218,7 +1218,7 @@ }, "brotli": { "baseline": "1.0.9", - "port-version": 4 + "port-version": 5 }, "brpc": { "baseline": "1.2.0",