diff options
| author | Jesse Towner <jwtowner@users.noreply.github.com> | 2021-04-07 14:22:28 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-07 14:22:28 -0700 |
| commit | 9d807041270262cc108b8deda60550a2cd95db1a (patch) | |
| tree | d69984c88d64d54b3217fa1fa1015fb29fa95fcc /scripts | |
| parent | e1f1938cb8fc646749a900c2cf82b8cc42ba0541 (diff) | |
| download | vcpkg-9d807041270262cc108b8deda60550a2cd95db1a.tar.gz vcpkg-9d807041270262cc108b8deda60550a2cd95db1a.zip | |
[woff2] fix for static linking and alternative compiler toolchains (#16392)
* [woff2] fix static linking and alternate toolchain
First, this change teaches the woff2 CMake configuration to
understand the vcpkg's custom unofficial-brotli pkg-config
configuration in order to support static linking. This fixes a
build failure on x64-linux or other triplets when
VCPKG_LIBRARY_LINKAGE is set to static.
Secondly, the CANONICAL_PREFIXES option for the woff2 CMake
configuration has been changed to be on by default, otherwise
custom triplets or toolchains using alternate compilers such as
Clang/LLVM or other versions of GCC will fail.
Leaving CANONICAL_PREFIXES set to OFF causes
-no-canonical-prefixes to be passed to the compiler, which
prevents symlinked compiler toolchains from working correctly.
If a user does actually need non-canonical prefixes, chances are
they will have a custom triplet or toolchain file that passes in
-no-canonical-prefixes as a CFLAG for every port, and so setting
it to ON here is a better default for vcpkg.
* [woff2] update versions
* [woff2] update control file
* [woff2] update versions
* [woff2] update ci.baseline.txt
* Update ports/woff2/0001-unofficial-brotli.patch
Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
* [woff2] regenerate 0001-unofficial-brotli.patch file
* [woff2] update versions
* [woff2] regenerate 0001-unofficial-brotli.patch file attempt #2
* [woff2] update versions
Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/ci.baseline.txt | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 91c098efc..f1668ba7d 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1702,10 +1702,6 @@ wintoast:arm-uwp=fail wintoast:x64-linux=fail wintoast:x64-osx=fail wintoast:x64-uwp=fail -woff2:x64-linux=fail -woff2:x64-osx=fail -woff2:x64-windows-static=fail -woff2:x64-windows-static-md=fail wpilib:arm64-windows=fail wpilib:x64-osx=fail wxchartdir:x64-osx=fail |