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

[libssh2] Update to 1.10.0 #20364

Merged
merged 15 commits into from
Oct 11, 2021
Merged

Conversation

chausner
Copy link
Contributor

Describe the pull request

  • What does your PR fix?

    Updates libssh2 to 1.10.0

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

    As before, Yes

  • 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?

    Yes

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/libssh2/portfile.cmake

@chausner
Copy link
Contributor Author

Closing since there is already an open PR: #20067

@chausner chausner closed this Sep 26, 2021
@chausner chausner deleted the libssh2-1.10.0 branch September 26, 2021 16:22
@JonLiu1993
Copy link
Member

@chausner, can you continue to update libssh2 to 1.10.0? I reverted the changes to libssh2, because some fixes are unreasonable, if you can continue to open this pr I will be very happy .

@chausner chausner restored the libssh2-1.10.0 branch September 27, 2021 19:18
@chausner chausner reopened this Sep 27, 2021
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/libssh2/portfile.cmake

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/libssh2/portfile.cmake

@chausner
Copy link
Contributor Author

chausner commented Sep 27, 2021

@JonLiu1993 Sure, I reopened the MR and fixed some remaining issues.

One thing I am not sure about is vcpkg build validation errors related to the DLL not having any exports and no import library getting built when I migrated to the new way of including CMake commands (vcpkg-cmake and vcpkg-cmake-config dependencies). Only after reverting this change (0fe7011) it works again.

So it seems vcpkg_configure_cmake is not equivalent to vcpkg_cmake_configure? Do you know what needs to be changed to make it work with the new commands?

@JonLiu1993 JonLiu1993 self-assigned this Sep 28, 2021
@JonLiu1993 JonLiu1993 added the category:port-update The issue is with a library, which is requesting update new revision label Sep 28, 2021
@JonLiu1993
Copy link
Member

JonLiu1993 commented Sep 28, 2021

@JonLiu1993 Sure, I reopened the MR and fixed some remaining issues.

One thing I am not sure about is vcpkg build validation errors related to the DLL not having any exports and no import library getting built when I migrated to the new way of including CMake commands (vcpkg-cmake and vcpkg-cmake-config dependencies). Only after reverting this change (0fe7011) it works again.

So it seems vcpkg_configure_cmake is not equivalent to vcpkg_cmake_configure? Do you know what needs to be changed to make it work with the new commands?

I read your modification and it is no problem. However, there are some BUGs in the use of new cmake functions. Not all ports are suitable for using the new cmake functions.

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/libssh2/portfile.cmake

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/libssh2/portfile.cmake

@JonLiu1993 JonLiu1993 added the info:reviewed Pull Request changes follow basic guidelines label Oct 8, 2021
@BillyONeal BillyONeal merged commit d7cc563 into microsoft:master Oct 11, 2021
@BillyONeal
Copy link
Member

Thanks for the version update!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
category:port-update The issue is with a library, which is requesting update new revision info:reviewed Pull Request changes follow basic guidelines
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants