Skip to content

[libmariadb] Fix build error with cmake 3.20.0 #17113

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.

Sign up for GitHub

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

Merged
vicroms merged 4 commits into from
Apr 7, 2021
Merged

[libmariadb] Fix build error with cmake 3.20.0 #17113

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8fd1e4b
[libmariadb] Fix build error with cmake 3.20.0
Apr 6, 2021
271ad1f
Update versions
Apr 6, 2021
d3191fb
Add vcpkg.json
Apr 7, 2021
5ceac49
Update versions/l-/libmariadb.json
Apr 7, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 0 additions & 17 deletions ports/libmariadb/CONTROL
View file
Open in desktop

This file was deleted.

13 changes: 13 additions & 0 deletions ports/libmariadb/fix-build-error-with-cmake3.20.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
diff --git a/cmake/ConnectorName.cmake b/cmake/ConnectorName.cmake
index b7bbbad..357b8ac 100644
--- a/cmake/ConnectorName.cmake
+++ b/cmake/ConnectorName.cmake
@@ -22,7 +22,7 @@ IF(CMAKE_SYSTEM_NAME MATCHES "Windows")
SET(MACHINE_NAME "x64")
ELSE()
SET(MACHINE_NAME "32")
- END()
+ ENDIF()
ENDIF()

SET(product_name "mysql-connector-c-${CPACK_PACKAGE_VERSION}-${PLATFORM_NAME}${CONCAT_SIGN}${MACHINE_NAME}")
1 change: 1 addition & 0 deletions ports/libmariadb/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ vcpkg_from_github(
fix-InstallPath.patch
fix-iconv.patch
export-cmake-targets.patch
fix-build-error-with-cmake3.20.patch #This can be removed in next release, which has been merged to upstream.
)

vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
Expand Down
31 changes: 31 additions & 0 deletions ports/libmariadb/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
{
"name": "libmariadb",
"version-semver": "3.1.12",
"port-version": 1,
"description": "MariaDB Connector/C is used to connect C/C++ applications to MariaDB and MySQL databases",
"homepage": "https://github.com/MariaDB/mariadb-connector-c",
"default-features": [
"openssl",
"zlib"
],
"features": {
"iconv": {
"description": "Enables character set conversion",
"dependencies": [
"libiconv"
]
},
"openssl": {
"description": "Enable SSL support",
"dependencies": [
"openssl"
]
},
"zlib": {
"description": "Use internal zlib",
"dependencies": [
"zlib"
]
}
}
}
2 changes: 1 addition & 1 deletion versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3218,7 +3218,7 @@
},
"libmariadb": {
"baseline": "3.1.12",
"port-version": 0
"port-version": 1
},
"libmaxminddb": {
"baseline": "1.4.3",
Expand Down
5 changes: 5 additions & 0 deletions versions/l-/libmariadb.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "98ab3766e520cc0e6804bdba42090eae12f9f24f",
"version-semver": "3.1.12",
"port-version": 1
},
{
"git-tree": "9bac7cad6eff90bd3227093a10ff9b85175922da",
"version-string": "3.1.12",
Expand Down