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

[libmysql] Update to 8.0.34 #34736

Merged
merged 10 commits into from
Nov 1, 2023
Merged

[libmysql] Update to 8.0.34 #34736

merged 10 commits into from
Nov 1, 2023

Conversation

dg0yt
Copy link
Contributor

@dg0yt dg0yt commented Oct 26, 2023

Update to 8.0.34.
Ensure devendoring of dependencies (as possible), in particular zstd, cf. #34640 (comment).
Fix pkg-config file installation.
Migrate to canonical unofficial CMake Config package (with polyfill for most transition cases). Same target name regardless of library linkage.
Limited support for cross builds, tested with arm64-linux (local) and arm64-windows (vcpkg CI).
Cleanup.

@jimwang118 jimwang118 added the category:port-update The issue is with a library, which is requesting update new revision label Oct 26, 2023
Copy link
Contributor

@silverqx silverqx left a comment

Choose a reason for hiding this comment

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

I tried this dg0yt/libmysql branch and I'm getting this warning about empty folder:

-- Installing: O:/Code/c_libs/vcpkg-tinyorm-port-qt6/packages/libmysql_x64-windows/share/libmysql/vcpkg-cmake-wrapper.cmake
-- Installing: O:/Code/c_libs/vcpkg-tinyorm-port-qt6/packages/libmysql_x64-windows/share/libmysql/usage
-- Performing post-build validation
warning: There should be no empty directories in O:\Code\c_libs\vcpkg-tinyorm-port-qt6\packages\libmysql_x64-windows. The following empty directories were found:

  O:\Code\c_libs\vcpkg-tinyorm-port-qt6\packages\libmysql_x64-windows\lib\debug

warning: If a directory should be populated but is not, this might indicate an error in the portfile.
If the directories are not needed and their creation cannot be disabled, use something like this in the portfile to remove them:
    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/debug")

error: Found 1 post-build check problem(s). To submit these ports to curated catalogs, please first correct the portfile: O:\Code\c_libs\vcpkg-tinyorm-port-qt6\ports\libmysql\portfile.cmake
Elapsed time to handle libmysql:x64-windows: 3.2 min
Total install time: 3.2 min
The package libmysql provides CMake targets:

    find_package(libmysql REQUIRED)
    target_link_libraries(main PRIVATE ${MYSQL_LIBRARIES})

Downstream Find modules are not standardized and cannot be wrapped
reliably. By moving the legacy wrapper behaviour to a config module,
we can catch those users which were relying on the old usage, and
display the instructions for migrating to the canonical unofficial
usage.
MESSAGE(STATUS "BSD built in DNS SRV APIs")
ELSE()
FIND_LIBRARY(RESOLV_LIBRARY NAMES resolv)
+ FIND_LIBRARY(RESOLV_LIBRARY NAMES resolv PATHS ${CMAKE_C_IMPLICIT_LINK_DIRECTORIES} NO_DEFAULT_PATH)
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Explicit search in CMAKE_C_IMPLICIT_LINK_DIRECTORIES only if regular search fails.

@dg0yt dg0yt marked this pull request as ready for review October 29, 2023 13:05
@jimwang118
Copy link
Contributor

Usage test pass with following triplets:

x86-windows
x64-windows
x64-windows-static

@jimwang118 jimwang118 added the info:reviewed Pull Request changes follow basic guidelines label Nov 1, 2023
@JavierMatosD JavierMatosD merged commit 23d3731 into microsoft:master Nov 1, 2023
15 checks passed
@dg0yt dg0yt deleted the libmysql branch November 1, 2023 19:09
@silverqx
Copy link
Contributor

silverqx commented Nov 1, 2023

It's ready? Can I try it with my port?

@dg0yt
Copy link
Contributor Author

dg0yt commented Nov 3, 2023

@silverqx It was ready, it was merged and so it is readily available in master.

@silverqx
Copy link
Contributor

silverqx commented Nov 3, 2023

I tried it now with x64-windows-static and x64-windows triplets and works without errors 👌

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.

4 participants