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

[proxygen]: fix dependency #22834

Merged
merged 3 commits into from
Apr 6, 2022
Merged

[proxygen]: fix dependency #22834

merged 3 commits into from
Apr 6, 2022

Conversation

jiayuehua
Copy link
Contributor

Describe the pull request

  • What does your PR fix?

    Fixes #...

  • Which triplets are supported/not supported? Have you updated the CI baseline?

    , <Yes/No>

  • Does your PR follow the maintainer guide?

    yes

  • If you have added/updated a port: Have you run ./vcpkg x-add-version --all and committed the result?

If you are still working on the PR, open it as a Draft: https://github.blog/2019-02-14-introducing-draft-pull-requests/

Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You have modified or added at least one portfile where deprecated functions are used.

If you feel able to do so, please consider migrating them to the new functions:
vcpkg_install_cmake -> vcpkg_cmake_install (from port vcpkg-cmake)
vcpkg_build_cmake -> vcpkg_cmake_build (from port vcpkg-cmake)
vcpkg_configure_cmake -> vcpkg_cmake_configure (Please remove the option PREFER_NINJA) (from port vcpkg-cmake)
vcpkg_fixup_cmake_targets -> vcpkg_cmake_config_fixup (from port vcpkg-cmake-config)

In the ports that use the new function, you have to add the corresponding dependencies:

{
  "name": "vcpkg-cmake",
  "host": true
},
{
  "name": "vcpkg-cmake-config",
  "host": true
}

The following files are affected:

  • ports/proxygen/portfile.cmake

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/proxygen/vcpkg.json

Valid values for the license field are listed at https://spdx.org/licenses/

find_dependency(wangle)
find_dependency(Fizz)
-find_dependency(mvfst)
+#find_dependency(mvfst)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why removed this dependency?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this dependency is not used.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you please confirm this with the upstream first?

Thanks.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@JackBoosY JackBoosY added category:port-bug The issue is with a library, which is something the port should already support requires:author-response labels Jan 28, 2022
@JackBoosY JackBoosY added depends:upstream-changes Waiting on a change to the upstream project and removed requires:author-response labels Jan 30, 2022
Copy link
Contributor

@ras0219-msft ras0219-msft left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This change 99% LGTM, however zstd::libzstd_static will only be defined if zstd was built statically.

Therefore, we either need to add logic to proxygen/lib/CMakeLists.txt to determine which target should be linked (zstd::libzstd_static vs zstd::libzstd_shared) or we should wait for a resolution to #22822 which will hopefully define both targets always.

@ras0219-msft ras0219-msft added depends:different-pr This PR or Issue depends on a PR which has been filed and removed depends:upstream-changes Waiting on a change to the upstream project labels Feb 1, 2022
@jiayuehua
Copy link
Contributor Author

jiayuehua commented Feb 2, 2022

I see. I also think waiting for that patch resolution is better. not merging now is right decision.

@JackBoosY
Copy link
Contributor

Since #22822 was merged, can we continue this PR?

@JackBoosY JackBoosY added requires:author-response and removed depends:different-pr This PR or Issue depends on a PR which has been filed labels Mar 18, 2022
@jiayuehua
Copy link
Contributor Author

I will have a look soon. My daily job is a bit busy at every end of the seasons.

Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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/proxygen/vcpkg.json

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

@jiayuehua
Copy link
Contributor Author

hi, @JackBoosY . I have updated my pr.

@JackBoosY JackBoosY added the info:reviewed Pull Request changes follow basic guidelines label Apr 6, 2022
@strega-nil-ms
Copy link
Contributor

Thanks!

@strega-nil-ms strega-nil-ms merged commit 8807db6 into microsoft:master Apr 6, 2022
@jiayuehua jiayuehua deleted the proxygen branch April 7, 2022 00:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
category:port-bug The issue is with a library, which is something the port should already support info:reviewed Pull Request changes follow basic guidelines
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants