diff options
| author | Adriaan de Groot <adridg@FreeBSD.org> | 2021-04-07 00:56:14 +0200 |
|---|---|---|
| committer | Adriaan de Groot <adridg@FreeBSD.org> | 2021-04-07 01:02:53 +0200 |
| commit | d1e9ddfd83317153a035ad80305ba472cadc5a73 (patch) | |
| tree | eb96972a9fdb535367481d327bbe0d425e37fff5 /databases | |
| parent | science/kst2: fix build ahead of CMake 3.20 (diff) | |
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.
Diffstat (limited to 'databases')
6 files changed, 55 insertions, 1 deletions
diff --git a/databases/mariadb-connector-c/Makefile b/databases/mariadb-connector-c/Makefile index 4b30e1272239..4767d6110b4d 100644 --- a/databases/mariadb-connector-c/Makefile +++ b/databases/mariadb-connector-c/Makefile @@ -1,4 +1,3 @@ - PORTNAME= mariadb-connector-c PORTVERSION= 3.1.10 CATEGORIES= databases diff --git a/databases/mariadb-connector-c/files/patch-libmariadb_cmake_ConnectorName.cmake b/databases/mariadb-connector-c/files/patch-libmariadb_cmake_ConnectorName.cmake new file mode 100644 index 000000000000..0cdf01e6f5b2 --- /dev/null +++ b/databases/mariadb-connector-c/files/patch-libmariadb_cmake_ConnectorName.cmake @@ -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}") diff --git a/databases/mariadb103-client/files/patch-libmariadb_cmake_ConnectorName.cmake b/databases/mariadb103-client/files/patch-libmariadb_cmake_ConnectorName.cmake new file mode 100644 index 000000000000..b052c93a494a --- /dev/null +++ b/databases/mariadb103-client/files/patch-libmariadb_cmake_ConnectorName.cmake @@ -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}") diff --git a/databases/mariadb103-server/files/patch-libmariadb_cmake_ConnectorName.cmake b/databases/mariadb103-server/files/patch-libmariadb_cmake_ConnectorName.cmake new file mode 100644 index 000000000000..b052c93a494a --- /dev/null +++ b/databases/mariadb103-server/files/patch-libmariadb_cmake_ConnectorName.cmake @@ -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}") diff --git a/databases/mariadb104-server/files/patch-libmariadb_cmake_ConnectorName.cmake b/databases/mariadb104-server/files/patch-libmariadb_cmake_ConnectorName.cmake new file mode 100644 index 000000000000..b052c93a494a --- /dev/null +++ b/databases/mariadb104-server/files/patch-libmariadb_cmake_ConnectorName.cmake @@ -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}") diff --git a/databases/mariadb105-server/files/patch-libmariadb_cmake_ConnectorName.cmake b/databases/mariadb105-server/files/patch-libmariadb_cmake_ConnectorName.cmake new file mode 100644 index 000000000000..b052c93a494a --- /dev/null +++ b/databases/mariadb105-server/files/patch-libmariadb_cmake_ConnectorName.cmake @@ -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}") |