[libmariadb] Update by dg0yt · Pull Request #21359 · microsoft/vcpkg

dg0yt · 2021-11-13T07:13:57Z

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).
~~Disables~~Adds 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

github-actions

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
     },

github-actions

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
     },

github-actions

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 · 2021-11-13T17:22:38Z

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 · 2021-11-13T17:40:48Z

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).

dg0yt · 2021-11-15T07:13:19Z

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 · 2021-11-15T07:19:17Z

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 · 2021-11-15T08:45:09Z

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

ports/libmariadb/export-cmake-targets.patch

ports/libmariadb/portfile.cmake

JonLiu1993 · 2021-11-17T06:23:33Z

All features are tested successfully in the following triplet:

x86-windows
x64-windows
x64-windows-static

Update to 3.1.15

af04a34

github-actions bot requested changes Nov 13, 2021

View reviewed changes

dg0yt force-pushed the libmariadb branch from 2af2b90 to 311ebc2 Compare November 13, 2021 08:35

github-actions bot requested changes Nov 13, 2021

View reviewed changes

dg0yt force-pushed the libmariadb branch 2 times, most recently from b31426d to 7e026ea Compare November 13, 2021 13:54

github-actions bot requested changes Nov 13, 2021

View reviewed changes

dg0yt added 10 commits November 13, 2021 17:36

Modernize portfile

cff0137

Keep plugins

3855029

Always use vcpkg zlib instead vendored copy

de94529

Use zlib and openssl modules in pc file

7bd1070

Always install pc file, drop non-relocatable mariadb_config

9fd9f10

UWP is not supported

2b5d173

Use schannel SSL backend on windows

d4383be

Fix exported includedir and libdir

226ee2b

Fixup windows pc file

dfb175f

Disable extra static lib

d7fabfa

dg0yt force-pushed the libmariadb branch from fc28b6b to 6f29d76 Compare November 13, 2021 17:00

dg0yt added 4 commits November 13, 2021 18:31

Disable plugins with extra dependencies

c194134

[libmariadb] Namespace targets with unofficial::

5877ddf

Update versions

05bd446

Enable CI for x86-windows: no conflict with mysql

1201c14

dg0yt force-pushed the libmariadb branch from 6f29d76 to 1201c14 Compare November 13, 2021 17:33

github-actions bot approved these changes Nov 13, 2021

View reviewed changes

dg0yt marked this pull request as ready for review November 13, 2021 17:37

JonLiu1993 self-assigned this Nov 15, 2021

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 added the requires:all-feature-testing label Nov 15, 2021

dg0yt marked this pull request as draft November 15, 2021 08:42

dg0yt added 3 commits November 15, 2021 21:44

Re-enable lib mariadbclient via feature

842289b

Use openssl targets to handle multi-config

058894b

Update versions

b74bb05

github-actions bot approved these changes Nov 15, 2021

View reviewed changes

dg0yt marked this pull request as ready for review November 15, 2021 20:51

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 labels Nov 16, 2021

JonLiu1993 approved these changes Nov 16, 2021

View reviewed changes

JonLiu1993 requested a review from JackBoosY November 16, 2021 08:05

JonLiu1993 added the requires:all-feature-testing label Nov 16, 2021

JackBoosY suggested changes Nov 16, 2021

View reviewed changes

ports/libmariadb/export-cmake-targets.patch Outdated Show resolved Hide resolved

ports/libmariadb/portfile.cmake Outdated Show resolved Hide resolved

JackBoosY added the requires:author-response label Nov 16, 2021

dg0yt added 2 commits November 16, 2021 09:59

CR request

f7088b1

Update versions

85cfa97

github-actions bot approved these changes Nov 16, 2021

View reviewed changes

JackBoosY approved these changes Nov 16, 2021

View reviewed changes

JackBoosY removed the requires:author-response label Nov 16, 2021

JonLiu1993 removed the requires:all-feature-testing label Nov 17, 2021

JonLiu1993 added the info:needs-maintainer-attention Lets the current 'on rotation' vcpkg maintainer know they need to look at this. label Nov 17, 2021

vicroms merged commit 3492464 into microsoft:master Nov 17, 2021

dg0yt deleted the libmariadb branch November 19, 2021 08:32

This was referenced Jan 5, 2022

The Mysql is not supported by drogon, please install the development library first. drogonframework/drogon#1146

Closed

[drogon] Fix MySQL finding #22378

Closed

dg0yt mentioned this pull request Jan 18, 2022

[<libmariadb>] build failure please don't change the link lib name #22614

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[libmariadb] Update#21359

[libmariadb] Update#21359
vicroms merged 20 commits intomicrosoft:masterfrom
dg0yt:libmariadb

dg0yt commented Nov 13, 2021 •

edited

Loading

Uh oh!

github-actions bot left a comment

Uh oh!

github-actions bot left a comment

Uh oh!

github-actions bot left a comment

Uh oh!

dg0yt commented Nov 13, 2021

Uh oh!

dg0yt commented Nov 13, 2021

Uh oh!

dg0yt commented Nov 15, 2021

What does your PR fix?

Uh oh!

JonLiu1993 commented Nov 15, 2021

What does your PR fix?

Uh oh!

dg0yt commented Nov 15, 2021

Uh oh!

Uh oh!

Uh oh!

JonLiu1993 commented Nov 17, 2021

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Conversation

dg0yt commented Nov 13, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

What does your PR fix?

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

Does your PR follow the maintainer guide?

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

Uh oh!

github-actions bot left a comment

Choose a reason for hiding this comment

Uh oh!

github-actions bot left a comment

Choose a reason for hiding this comment

Uh oh!

github-actions bot left a comment

Choose a reason for hiding this comment

Uh oh!

dg0yt commented Nov 13, 2021

Uh oh!

dg0yt commented Nov 13, 2021

Uh oh!

dg0yt commented Nov 15, 2021

What does your PR fix?

Uh oh!

JonLiu1993 commented Nov 15, 2021

What does your PR fix?

Uh oh!

dg0yt commented Nov 15, 2021

Uh oh!

Uh oh!

Uh oh!

JonLiu1993 commented Nov 17, 2021

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

dg0yt commented Nov 13, 2021 •

edited

Loading

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