Skip to content

Revert "incorporate changes from microsoft:master"#2

Merged
jgehw merged 1 commit intomasterfrom
revert-1-master
Aug 18, 2020
Merged

Revert "incorporate changes from microsoft:master"#2
jgehw merged 1 commit intomasterfrom
revert-1-master

Conversation

@jgehw
Copy link
Copy Markdown
Owner

@jgehw jgehw commented Aug 18, 2020

Reverts #1

@jgehw jgehw merged commit 2571bd1 into master Aug 18, 2020
@jgehw jgehw deleted the revert-1-master branch August 18, 2020 17:15
jgehw pushed a commit that referenced this pull request May 25, 2021
…icrosoft#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>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant