[fbthrift, fizz, folly, mvfst] Fix dependency resolution. #23124

BillyONeal · 2022-02-16T06:41:09Z

Found by nightly build https://dev.azure.com/vcpkg/public/_build/results?buildId=67402

wangle was fixed by a compiler update on a patch tuesday.
this unblocked attempting fbthrift on x64-windows hosts, but it misses a header; added patch already merged upstream adding missing algorithm
fixed folly attempt to insert the right debug prefix which was broken by vcpkg_fixup_cmake_targets no longer generating _IMPORT_PREFIX.
disable dynamic build of fbthrift because it tries to create DLLs with no import libs and does not properly copy over DLL dependencies
Also remove the same unwanted find modules from mvfst

Found by nightly build https://dev.azure.com/vcpkg/public/_build/results?buildId=67402 * wangle was fixed by a compiler update on a patch tuesday. * this unblocked attempting fbthrift on x64-windows hosts, but it misses a header; added patch already merged upstream adding missing algorithm <include> * fixed folly attempt to insert the right debug prefix which was broken by vcpkg_fixup_cmake_targets no longer generating _IMPORT_PREFIX. * disable dynamic build of fbthrift on Windows because it tries to create DLLs with no import libs (because it makes no exports)

ports/fizz/fix-dependencies.patch

github-actions

This is a new experimental fast check for PR issues. Please let us know if this bot is helpful!

All manifest files must be formatted

./vcpkg format-manifest ports/*/vcpkg.json

Diff

diff --git a/ports/fizz/vcpkg.json b/ports/fizz/vcpkg.json
index 096f417..3688b94 100644
--- a/ports/fizz/vcpkg.json
+++ b/ports/fizz/vcpkg.json
@@ -5,12 +5,12 @@
   "description": "a TLS 1.3 implementation by Facebook",
   "homepage": "https://github.com/facebookincubator/fizz",
   "dependencies": [
+    "double-conversion",
     "fmt",
     "folly",
     "libevent",
     "libsodium",
     "openssl",
-    "double-conversion",
     {
       "name": "vcpkg-cmake",
       "host": true

After committing all other changes, the version database must be updated

git add -u && git commit
git checkout 871158e31d673606df779b8d0dce1a594c1397a4 -- versions
./vcpkg x-add-version --all

Diff

diff --git a/versions/baseline.json b/versions/baseline.json
index 64bd50e..7572237 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -2138,7 +2138,7 @@
     },
     "fbthrift": {
       "baseline": "2022.01.31.00",
-      "port-version": 0
+      "port-version": 1
     },
     "fcl": {
       "baseline": "0.7.0",
@@ -2174,7 +2174,7 @@
     },
     "fizz": {
       "baseline": "2022.01.31.00",
-      "port-version": 0
+      "port-version": 1
     },
     "flann": {
       "baseline": "2019-04-07",
@@ -2230,7 +2230,7 @@
     },
     "folly": {
       "baseline": "2022.01.31.00",
-      "port-version": 0
+      "port-version": 1
     },
     "font-chef": {
       "baseline": "1.1.0",
diff --git a/versions/f-/fbthrift.json b/versions/f-/fbthrift.json
index 7fb76eb..cd432ef 100644
--- a/versions/f-/fbthrift.json
+++ b/versions/f-/fbthrift.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "938a0d47082c4e236d46ebd10fc248bf45e7840d",
+      "version-string": "2022.01.31.00",
+      "port-version": 1
+    },
     {
       "git-tree": "f92f736e3c525d5ac52b546eae1e0b9cf880b382",
       "version-string": "2022.01.31.00",
diff --git a/versions/f-/fizz.json b/versions/f-/fizz.json
index 7e4d7a3..92692f4 100644
--- a/versions/f-/fizz.json
+++ b/versions/f-/fizz.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "68dcb86fb09b75f70b80beb991b300447c1fd6cd",
+      "version-string": "2022.01.31.00",
+      "port-version": 1
+    },
     {
       "git-tree": "14651559e385107d92830b5464007f7b49a1ce4c",
       "version-string": "2022.01.31.00",
diff --git a/versions/f-/folly.json b/versions/f-/folly.json
index b04ce61..112c163 100644
--- a/versions/f-/folly.json
+++ b/versions/f-/folly.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "10d3306d94114d0916a4691c131e233c08dc9090",
+      "version-string": "2022.01.31.00",
+      "port-version": 1
+    },
     {
       "git-tree": "b6f74d739ff2aef400ac83919bd9753eb1cc647f",
       "version-string": "2022.01.31.00",

You have modified or added at least one vcpkg.json where a "license" field is missing.

If you feel able to do so, please consider adding a "license" field to the following files:

ports/fbthrift/vcpkg.json
ports/fizz/vcpkg.json

Valid values for the license field can be found in the documentation

github-actions

This is a new experimental fast check for PR issues. Please let us know if this bot is helpful!

After committing all other changes, the version database must be updated

git add -u && git commit
git checkout 871158e31d673606df779b8d0dce1a594c1397a4 -- versions
./vcpkg x-add-version --all

Diff

diff --git a/versions/f-/fizz.json b/versions/f-/fizz.json
index 4c5039a..92692f4 100644
--- a/versions/f-/fizz.json
+++ b/versions/f-/fizz.json
@@ -1,7 +1,7 @@
 {
   "versions": [
     {
-      "git-tree": "fafe11ca7d00a5da02e4b94b0c1e23499220896d",
+      "git-tree": "68dcb86fb09b75f70b80beb991b300447c1fd6cd",
       "version-string": "2022.01.31.00",
       "port-version": 1
     },

You have modified or added at least one vcpkg.json where a "license" field is missing.

If you feel able to do so, please consider adding a "license" field to the following files:

ports/fbthrift/vcpkg.json
ports/fizz/vcpkg.json

Valid values for the license field can be found in the documentation

…ts all its dependencies to be linked statically and patching the build system to copy over the right DLLs seems out of scope)

github-actions

You have modified or added at least one vcpkg.json where a "license" field is missing.

If you feel able to do so, please consider adding a "license" field to the following files:

ports/fbthrift/vcpkg.json
ports/fizz/vcpkg.json

Valid values for the license field can be found in the documentation

github-actions

You have modified or added at least one vcpkg.json where a "license" field is missing.

If you feel able to do so, please consider adding a "license" field to the following files:

ports/fbthrift/vcpkg.json
ports/fizz/vcpkg.json

Valid values for the license field can be found in the documentation

github-actions

You have modified or added at least one vcpkg.json where a "license" field is missing.

If you feel able to do so, please consider adding a "license" field to the following files:

ports/fbthrift/vcpkg.json
ports/fizz/vcpkg.json
ports/mvfst/vcpkg.json

Valid values for the license field can be found in the documentation

github-actions

This is a new experimental fast check for PR issues. Please let us know if this bot is helpful!

After committing all other changes, the version database must be updated

git add -u && git commit
git checkout 871158e31d673606df779b8d0dce1a594c1397a4 -- versions
./vcpkg x-add-version --all

Diff

diff --git a/versions/f-/fizz.json b/versions/f-/fizz.json
index 90a79d5..13c383d 100644
--- a/versions/f-/fizz.json
+++ b/versions/f-/fizz.json
@@ -1,7 +1,7 @@
 {
   "versions": [
     {
-      "git-tree": "3b4db356be2199141a97f5fe919520e4afd3eb6b",
+      "git-tree": "57fdd6342f89ccc3569b1a3416be67cd8dd7b59d",
       "version-string": "2022.01.31.00",
       "port-version": 1
     },

You have modified or added at least one vcpkg.json where a "license" field is missing.

If you feel able to do so, please consider adding a "license" field to the following files:

ports/fbthrift/vcpkg.json
ports/fizz/vcpkg.json
ports/mvfst/vcpkg.json

Valid values for the license field can be found in the documentation

github-actions

You have modified or added at least one vcpkg.json where a "license" field is missing.

If you feel able to do so, please consider adding a "license" field to the following files:

ports/fbthrift/vcpkg.json
ports/fizz/vcpkg.json
ports/mvfst/vcpkg.json

Valid values for the license field can be found in the documentation

BillyONeal added category:port-bug The issue is with a library, which is something the port should already support info:internal This PR or Issue was filed by the vcpkg team. labels Feb 16, 2022

BillyONeal commented Feb 16, 2022

View reviewed changes

ports/fizz/fix-dependencies.patch Outdated Show resolved Hide resolved

github-actions bot requested changes Feb 16, 2022

View reviewed changes

Format and fix version database.

d177714

github-actions bot requested changes Feb 16, 2022

View reviewed changes

BillyONeal added 2 commits February 16, 2022 10:47

Back out fizz patches.

963ed8a

Block dynamic flavors. (The build in question builds an exe and expec…

14b9d20

…ts all its dependencies to be linked statically and patching the build system to copy over the right DLLs seems out of scope)

github-actions bot approved these changes Feb 16, 2022

View reviewed changes

JonLiu1993 assigned LilyWangLL Feb 17, 2022

Add libevent patch.

be4c2ee

github-actions bot approved these changes Feb 17, 2022

View reviewed changes

Also fixup mvfst and add missing CONFIG to patch.

279956e

github-actions bot approved these changes Feb 17, 2022

View reviewed changes

BillyONeal added 2 commits February 16, 2022 19:21

Remove unused patch.

7d77fc7

Fix version sha

4555d9c

github-actions bot requested changes Feb 17, 2022

View reviewed changes

github-actions bot approved these changes Feb 17, 2022

View reviewed changes

BillyONeal changed the title ~~[fbthrift, fizz, folly] Fix dependency resolution.~~ [fbthrift, fizz, folly, mvfst] Fix dependency resolution. Feb 17, 2022

vicroms approved these changes Feb 17, 2022

View reviewed changes

vicroms merged commit 6647a76 into microsoft:master Feb 17, 2022

BillyONeal deleted the fbthrift branch February 17, 2022 03:57

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[fbthrift, fizz, folly, mvfst] Fix dependency resolution. #23124

[fbthrift, fizz, folly, mvfst] Fix dependency resolution. #23124

BillyONeal commented Feb 16, 2022 •

edited

Loading

github-actions bot left a comment

github-actions bot left a comment

github-actions bot left a comment

github-actions bot left a comment

github-actions bot left a comment

github-actions bot left a comment

github-actions bot left a comment

[fbthrift, fizz, folly, mvfst] Fix dependency resolution. #23124

[fbthrift, fizz, folly, mvfst] Fix dependency resolution. #23124

Conversation

BillyONeal commented Feb 16, 2022 • edited Loading

github-actions bot left a comment

Choose a reason for hiding this comment

github-actions bot left a comment

Choose a reason for hiding this comment

github-actions bot left a comment

Choose a reason for hiding this comment

github-actions bot left a comment

Choose a reason for hiding this comment

github-actions bot left a comment

Choose a reason for hiding this comment

github-actions bot left a comment

Choose a reason for hiding this comment

github-actions bot left a comment

Choose a reason for hiding this comment

BillyONeal commented Feb 16, 2022 •

edited

Loading