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] upgrade to 8.0.32 #30576

Merged
merged 10 commits into from
Apr 11, 2023
Merged

[libmysql] upgrade to 8.0.32 #30576

merged 10 commits into from
Apr 11, 2023

Conversation

kotori2
Copy link
Contributor

@kotori2 kotori2 commented Mar 31, 2023

  • Changes comply with the maintainer guide
  • SHA512s are updated for each updated download
  • The "supports" clause reflects platforms that may be fixed by this new version
  • Any fixed CI baseline entries are removed from that file.
  • Any patches that are no longer applied are deleted from the port's directory.
  • The version database is fixed by rerunning ./vcpkg x-add-version --all and committing the result.
  • Only one version is added to each modified port's versions file.

@kotori2 kotori2 marked this pull request as draft March 31, 2023 08:28
@FrankXie05 FrankXie05 added the category:port-update The issue is with a library, which is requesting update new revision label Mar 31, 2023
@kotori2 kotori2 marked this pull request as ready for review April 1, 2023 04:21
FrankXie05
FrankXie05 previously approved these changes Apr 3, 2023
@FrankXie05 FrankXie05 added info:reviewed Pull Request changes follow basic guidelines and removed requires:author-response labels Apr 3, 2023
ports/libmysql/system-libs.patch Outdated Show resolved Hide resolved
ports/libmysql/system-libs.patch Show resolved Hide resolved
@kotori2 kotori2 requested a review from FrankXie05 April 3, 2023 23:21
@kotori2
Copy link
Contributor Author

kotori2 commented Apr 4, 2023

I'm wondering... Does the dirname hack in mysql_config really works?

ldata='`dirname $0`/../../data'
execdir='`dirname $0`/../../bin'
bindir='`dirname $0`/../../bin'

Update:
I really don't think it's working... Gonna fix this soon.

 ./mysql_config
Usage: ./mysql_config [OPTIONS]
Compiler: AppleClang 14.0.3.14030022
Options:
        --cflags         [-I./../../include ]
        --cxxflags       [-I./../../include ]
        --include        [-I./../../include]
        --libs           [-L`dirname $0`/../../lib -l -l$<$<NOT:$<CONFIG:DEBUG>>:./../../../../installed/arm64-osx/lib/libz.a> -l$<$<CONFIG:DEBUG>:./../../../../installed/arm64-osx/debug/lib/libz.a> -lOpenSSL::SSL -lOpenSSL::Crypto -lresolv]
        --libs_r         [-L`dirname $0`/../../lib -l -l$<$<NOT:$<CONFIG:DEBUG>>:./../../../../installed/arm64-osx/lib/libz.a> -l$<$<CONFIG:DEBUG>:./../../../../installed/arm64-osx/debug/lib/libz.a> -lOpenSSL::SSL -lOpenSSL::Crypto -lresolv]
        --plugindir      [`dirname $0`/../../lib/plugin]
        --socket         [/tmp/mysql.sock]
        --port           [0]
        --version        [8.0.32]
        --variable=VAR   VAR is one of:
                pkgincludedir [./../../include]
                pkglibdir     [`dirname $0`/../../lib]
                plugindir     [`dirname $0`/../../lib/plugin]

@kotori2
Copy link
Contributor Author

kotori2 commented Apr 4, 2023

This PR is ready for review.

set(MYSQL_CONFIG_FILE "${CURRENT_PACKAGES_DIR}/tools/libmysql/mysql_config")
vcpkg_replace_string(${MYSQL_CONFIG_FILE} "/bin/mysql_.*config" "/tools/libmysql/mysql_.*config") # try to get correct $basedir
vcpkg_replace_string(${MYSQL_CONFIG_FILE} "${CURRENT_PACKAGES_DIR}" "$basedir") # use $basedir to format paths
vcpkg_replace_string(${MYSQL_CONFIG_FILE} "-l\$\<\$\<CONFIG:DEBUG\>:${CURRENT_INSTALLED_DIR}/debug/lib/libz.a> " "") # remove debug version of libz
Copy link
Member

Choose a reason for hiding this comment

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

This does not seem correct; it's assuming that the caller is going to respect CMake generator expressions, but that's not the intended audience of this thing. If MySQL just wanted cmake to work, they'd be publishing cmake configs, not random bash scripts intended to be used like pkgconfig.

If there's no way to express the difference between release and debug here I think it would be acceptable to just pick release since that seems to be what's expected from pkgconfig-like callers?

Copy link
Member

Choose a reason for hiding this comment

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

Oh wait, I'm an idiot, you're removing those :sigh:

@BillyONeal BillyONeal merged commit 774469f into microsoft:master Apr 11, 2023
@BillyONeal
Copy link
Member

Thanks for the 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.

4 participants