diff options
| author | Marius Bakke <marius@gnu.org> | 2021-05-09 14:38:36 +0200 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2021-05-09 23:43:32 +0200 |
| commit | 1539af46d08e6cd05712c0368e6becdcebd32d9f (patch) | |
| tree | 8619f7ccc9284de6790ed2187eac8ca33774f4d6 /gnu/packages/patches | |
| parent | 9e729d9a2fa8f27157424f14b281ad31a1396a22 (diff) | |
gnu: CMake: Update to 3.20.2.
* gnu/packages/cmake.scm (%common-disabled-tests): Don't disable BootstrapTest.
(cmake-bootstrap): Update to 3.20.2.
[source](modules, snippet): Move from here ...
(cmake-minimal)[source]: ... to here.
* gnu/packages/patches/mariadb-cmake-compat.patch: New file.
* gnu/local.mk (dist_patch_DATA): Adjust accordingly.
* gnu/packages/databases.scm (mariadb)[source](patches): Add it.
Diffstat (limited to 'gnu/packages/patches')
| -rw-r--r-- | gnu/packages/patches/mariadb-cmake-compat.patch | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/gnu/packages/patches/mariadb-cmake-compat.patch b/gnu/packages/patches/mariadb-cmake-compat.patch new file mode 100644 index 0000000000..44b0daa186 --- /dev/null +++ b/gnu/packages/patches/mariadb-cmake-compat.patch @@ -0,0 +1,17 @@ +Fix if statement that triggers syntax error in CMake 3.20 and later. + +Taken from upstream: +https://github.com/mariadb-corporation/mariadb-connector-c/commit/242cab8c + +diff --git a/libmariadb/cmake/ConnectorName.cmake b/libmariadb/cmake/ConnectorName.cmake +--- a/libmariadb/cmake/ConnectorName.cmake ++++ b/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}")
\ No newline at end of file |