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

[libmariadb] Update #21359

Merged
merged 20 commits into from
Nov 17, 2021
Merged

[libmariadb] Update #21359

merged 20 commits into from
Nov 17, 2021

Conversation

dg0yt
Copy link
Contributor

@dg0yt dg0yt commented Nov 13, 2021

  • What does your PR fix?

    Updates libmariadb to 3.1.15.
    Modernizes the portfile.
    Always uses zlib from vcpkg (resolves [libmariadb] build failure with feature zlib disabled #20369).
    Retains plugins.
    Fixes cmake config and pc file.
    Adds proper namespace unofficial to exported targets.
    Exports a valid pc file also for Windows.
    Drops the mariadb_config executable (not for windows, and not relocatable).
    Adds schannel as SSL backend for Windows (default).
    DisablesAdds an optional feature for the extra mariadbclient lib which is always static, but otherwise not different from libmariadb AFAICT.
    Enables CI for x86-windows.

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

    all but UWP, 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.

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 8cfe802099de05ed9abab9a63db2524dd1fe1cae -- versions
./vcpkg x-add-version --all
Diff
diff --git a/versions/l-/libmariadb.json b/versions/l-/libmariadb.json
index de3e23b..ef74de4 100644
--- a/versions/l-/libmariadb.json
+++ b/versions/l-/libmariadb.json
@@ -1,7 +1,7 @@
 {
   "versions": [
     {
-      "git-tree": "e9eb8998b029cbf5366d83123f336684087ddda9",
+      "git-tree": "d591e2208faeb3b72cbfc1542dfe5b7730eeda25",
       "version-semver": "3.1.15",
       "port-version": 0
     },

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.

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 8cfe802099de05ed9abab9a63db2524dd1fe1cae -- versions
./vcpkg x-add-version --all
Diff
diff --git a/versions/l-/libmariadb.json b/versions/l-/libmariadb.json
index de3e23b..6401cd7 100644
--- a/versions/l-/libmariadb.json
+++ b/versions/l-/libmariadb.json
@@ -1,7 +1,7 @@
 {
   "versions": [
     {
-      "git-tree": "e9eb8998b029cbf5366d83123f336684087ddda9",
+      "git-tree": "59d761c2579c8bffccfc6f2017f57821763dd383",
       "version-semver": "3.1.15",
       "port-version": 0
     },

@dg0yt dg0yt force-pushed the libmariadb branch 2 times, most recently from b31426d to 7e026ea Compare November 13, 2021 13:54
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.

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

PRs must add only one version and must not modify any published versions

When making any changes to a library, the version or port-version in vcpkg.json or CONTROL must be modified.

Error: Local changes detected for gdal but no changes to version or port version.
-- Version: 3.3.2#4
-- Old SHA: a9ec2540fda2dfe657e004b70d5ca5a1cc7a2db8
-- New SHA: 3fcdbf9adb5b04dd6635b24bcaa398685127c760
-- Did you remember to update the version or port version?
-- Pass `--overwrite-version` to bypass this check.
***No files were updated.***
Error: Local changes detected for poco but no changes to version or port version.
-- Version: 1.11.0
-- Old SHA: e8f4d5c1548d23526e05b069ee626d7d7f9a4399
-- New SHA: e5baee9bb5b06a8e33ad43c073194be9d41c8a97
-- Did you remember to update the version or port version?
-- Pass `--overwrite-version` to bypass this check.
***No files were updated.***
After committing all other changes, the version database must be updated
git add -u && git commit
git checkout 8cfe802099de05ed9abab9a63db2524dd1fe1cae -- versions
./vcpkg x-add-version --all
Diff
diff --git a/versions/l-/libmariadb.json b/versions/l-/libmariadb.json
index 4c7dde0..b715d6c 100644
--- a/versions/l-/libmariadb.json
+++ b/versions/l-/libmariadb.json
@@ -1,7 +1,7 @@
 {
   "versions": [
     {
-      "git-tree": "a2e5c4471ef31b3ced389aff253adc7ac9fce470",
+      "git-tree": "9827e88fd6f6f00b3ac2e0a33c76b0dad8a5f5c6",
       "version-semver": "3.1.15",
       "port-version": 0
     },

@dg0yt
Copy link
Contributor Author

dg0yt commented Nov 13, 2021

https://dev.azure.com/vcpkg/public/_build/results?buildId=62947&view=results validated the build and the exported configuration:

  • gdal, using the libmariadb pkgconfig files for autotools and for nmake (not yet part of master)
  • osg (cmake, using the unofficial target via the gdal wrapper)
  • pdal (cmake, using the unofficial target via the gdal wrapper)
  • poco (cmake, using the unofficial target)
  • sqlpp11-connector-mysql (cmake)

@dg0yt dg0yt marked this pull request as ready for review November 13, 2021 17:37
@dg0yt
Copy link
Contributor Author

dg0yt commented Nov 13, 2021

I removed the CI baseline skip for x86-windows because mysql is also skipped for this triplet, and so there can't be a conflict in CI. This gives some CI coverage for libmariadb, including usage by sqlpp11-connector-mysql (cmake).

@JonLiu1993 JonLiu1993 self-assigned this Nov 15, 2021
@JonLiu1993 JonLiu1993 added category:port-bug The issue is with a library, which is something the port should already support category:port-update The issue is with a library, which is requesting update new revision labels Nov 15, 2021
@JonLiu1993 JonLiu1993 added the requires:all-feature-testing vcpkg install port[all features supported by that port] needs to be demonstrated to function label Nov 15, 2021
@dg0yt
Copy link
Contributor Author

dg0yt commented Nov 15, 2021

  • What does your PR fix?

    ...
    Disables the extra mariadbclient lib which is always static, but otherwise not different from libmariadb AFAICT.

The mariadbclient lib is pointless IMO. (Even same size as libmariadb on x64-linux.) However, after submitting the PR I started wondering if it should be made available via an optional feature, for the users who rely on it.

@JonLiu1993
Copy link
Member

  • What does your PR fix?

    ...
    Disables the extra mariadbclient lib which is always static, but otherwise not different from libmariadb AFAICT.

The mariadbclient lib is pointless IMO. (Even same size as libmariadb on x64-linux.) However, after submitting the PR I started wondering if it should be made available via an optional feature, for the users who rely on it.

It may be better for users to provide optional features

@dg0yt dg0yt marked this pull request as draft November 15, 2021 08:42
@dg0yt
Copy link
Contributor Author

dg0yt commented Nov 15, 2021

In addition, mariadb also suffers from an unguarded /lib/ path in exported cmake config. (For openssl, a common pattern.)
Cf. #21415.

@dg0yt dg0yt marked this pull request as ready for review November 15, 2021 20:51
@JonLiu1993 JonLiu1993 added category:port-feature The issue is with a library, which is requesting new capabilities that didn’t exist and removed requires:all-feature-testing vcpkg install port[all features supported by that port] needs to be demonstrated to function labels Nov 16, 2021
@JonLiu1993 JonLiu1993 added the requires:all-feature-testing vcpkg install port[all features supported by that port] needs to be demonstrated to function label Nov 16, 2021
ports/libmariadb/export-cmake-targets.patch Outdated Show resolved Hide resolved
ports/libmariadb/portfile.cmake Outdated Show resolved Hide resolved
@JonLiu1993 JonLiu1993 removed the requires:all-feature-testing vcpkg install port[all features supported by that port] needs to be demonstrated to function label Nov 17, 2021
@JonLiu1993
Copy link
Member

All features are tested successfully in the following triplet:

  • x86-windows
  • x64-windows
  • x64-windows-static

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 category:port-feature The issue is with a library, which is requesting new capabilities that didn’t exist 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.

[libmariadb] build failure with feature zlib disabled
4 participants