Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[folly] update to <v2022.10.24.00> #27580

Merged
merged 9 commits into from
Nov 8, 2022
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions ports/folly/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,15 @@ vcpkg_add_to_path("${PYTHON3_DIR}")
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO facebook/folly
REF 46c03de426e26f4c5a92df37ab233c586fbe369a #v2022.08.15.00
SHA512 6798878d6892ed79d954fb5754ee102ea04868bce4be9be5dc7c6d6c7ddcbc5573719fe09470d89c385d9e487a75d1a9abc70c29c67698b957fc68b97a8bea32
REF d8ed9cd2869c74b00fa6f1a7603301183f5c2249 #v2022.10.31.00
SHA512 55040dadb8a847f0d04c37a2dce920bb456a59decebc90920831998df9671feb33daf1f4235115adcce5eb9c469b97b9d96fa7a67a5914c434ebc1efc04f4770
HEAD_REF main
PATCHES
reorder-glog-gflags.patch
disable-non-underscore-posix-names.patch
boost-1.70.patch
fix-windows-minmax.patch
fix-deps.patch
fix-deps.patch
JonLiu1993 marked this conversation as resolved.
Show resolved Hide resolved
)

file(REMOVE "${SOURCE_PATH}/CMake/FindFmt.cmake")
Expand Down
3 changes: 1 addition & 2 deletions ports/folly/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{
"name": "folly",
"version-string": "2022.08.15.00",
"port-version": 1,
"version-string": "2022.10.31.00",
"description": "An open-source C++ library developed and used at Facebook. The library is UNSTABLE on Windows",
"homepage": "https://github.com/facebook/folly",
"license": "Apache-2.0",
Expand Down
12 changes: 6 additions & 6 deletions versions/baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -2381,8 +2381,8 @@
"port-version": 0
},
"folly": {
"baseline": "2022.08.15.00",
"port-version": 1
"baseline": "2022.10.31.00",
"port-version": 0
},
"font-chef": {
"baseline": "1.1.0",
Expand Down Expand Up @@ -6832,6 +6832,10 @@
"baseline": "1.3.1",
"port-version": 0
},
"shader-slang": {
"baseline": "0.23.13",
"port-version": 0
},
"shaderc": {
"baseline": "2021.1",
"port-version": 3
Expand Down Expand Up @@ -6916,10 +6920,6 @@
"baseline": "1.13.0",
"port-version": 2
},
"shader-slang": {
"baseline": "0.23.13",
"port-version": 0
},
"sleef": {
"baseline": "3.5.1",
"port-version": 3
Expand Down
5 changes: 5 additions & 0 deletions versions/f-/folly.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "f1bf5697bd71668ebaca666b8a2350f3f9221e86",
"version-string": "2022.10.31.00",
"port-version": 0
},
{
"git-tree": "968cb6f9f5300306d010ffabc297339c40ade808",
"version-string": "2022.08.15.00",
Expand Down