3party/vcpkg
0
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-12-28 03:10:57 +08:00
Code Issues Projects Releases Wiki Activity

[brotli] Fix build failure on arm64-uwp (#10116)

Browse Source 
* [brotli] Fix build failure on arm64-uwp

* update baseline
This commit is contained in:
Jack·Boos·Yu 2020-02-26 06:18:40 +08:00 committed by GitHub
parent d317268f4f
commit c6b58e366a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports/brotli/CONTROL
View File

@ -1,4 +1,4 @@
Source: brotli
Version: 1.0.7
Version: 1.0.7-1
Homepage: https://github.com/google/brotli
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.

13
ports/brotli/fix-arm-uwp.patch Normal file
View File

@ -0,0 +1,13 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e6c6054..2c4b757 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -124,6 +124,8 @@ elseif(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
add_definitions(-DOS_FREEBSD)
elseif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
add_definitions(-DOS_MACOSX)
+elseif(MSVC)
+ add_definitions(-D_CRT_SECURE_NO_WARNINGS)
endif()
function(transform_sources_list INPUT_FILE OUTPUT_FILE)

12
ports/brotli/portfile.cmake
View File

@ -1,12 +1,12 @@
include(vcpkg_common_functions)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO google/brotli
REF v1.0.7
SHA512 a82362aa36d2f2094bca0b2808d9de0d57291fb3a4c29d7c0ca0a37e73087ec5ac4df299c8c363e61106fccf2fe7f58b5cf76eb97729e2696058ef43b1d3930a
HEAD_REF master
PATCHES install.patch
PATCHES
install.patch
fix-arm-uwp.patch
)
vcpkg_configure_cmake(
@ -17,10 +17,10 @@ vcpkg_configure_cmake(
vcpkg_install_cmake()
vcpkg_copy_pdbs()
vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/brotli)
vcpkg_fixup_cmake_targets(CONFIG_PATH share/unofficial-brotli TARGET_PATH share/unofficial-brotli)
file(COPY ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/unofficial-brotli)
file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/brotli RENAME copyright)
vcpkg_copy_pdbs()
file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)

2
scripts/ci.baseline.txt
View File

@ -187,8 +187,6 @@ box2d:x64-uwp=fail
box2d:arm-uwp=fail
breakpad:arm64-windows=fail
breakpad:x64-osx=fail
brotli:arm-uwp=fail
brotli:x64-uwp=fail
bullet3:arm64-windows=fail
bullet3:arm-uwp=fail
bullet3:x64-uwp=fail