-
Notifications
You must be signed in to change notification settings - Fork 725
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
databases/mariadb*: fix build ahead of CMake 3.20
All of the MariaDB releases contain the same ConnectorName CMake module, and all of those copies of the module contain the same syntax error. CMake < 3.20 ignores this and treats end() as endif(), but this is an error in the upcoming version. Specifically NOT bumping PORTREVISION because this is a build-only fix that has no effect on the package.
- Loading branch information
Adriaan de Groot
authored and
Adriaan de Groot
committed
Apr 6, 2021
1 parent
bc2e032
commit d1e9ddf
Showing
6 changed files
with
55 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,3 @@ | ||
|
|
||
| PORTNAME= mariadb-connector-c | ||
| PORTVERSION= 3.1.10 | ||
| CATEGORIES= databases | ||
|
|
||
11 changes: 11 additions & 0 deletions
11
databases/mariadb-connector-c/files/patch-libmariadb_cmake_ConnectorName.cmake
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| --- cmake/ConnectorName.cmake.orig 2021-04-02 09:49:25 UTC | ||
| +++ 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}") |
11 changes: 11 additions & 0 deletions
11
databases/mariadb103-client/files/patch-libmariadb_cmake_ConnectorName.cmake
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| --- libmariadb/cmake/ConnectorName.cmake.orig 2021-04-02 09:49:25 UTC | ||
| +++ libmariadb/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}") |
11 changes: 11 additions & 0 deletions
11
databases/mariadb103-server/files/patch-libmariadb_cmake_ConnectorName.cmake
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| --- libmariadb/cmake/ConnectorName.cmake.orig 2021-04-02 09:49:25 UTC | ||
| +++ libmariadb/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}") |
11 changes: 11 additions & 0 deletions
11
databases/mariadb104-server/files/patch-libmariadb_cmake_ConnectorName.cmake
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| --- libmariadb/cmake/ConnectorName.cmake.orig 2021-04-02 09:49:25 UTC | ||
| +++ libmariadb/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}") |
11 changes: 11 additions & 0 deletions
11
databases/mariadb105-server/files/patch-libmariadb_cmake_ConnectorName.cmake
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| --- libmariadb/cmake/ConnectorName.cmake.orig 2021-04-02 09:49:25 UTC | ||
| +++ libmariadb/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}") |