diff options
| author | Efraim Flashner <efraim@flashner.co.il> | 2021-09-29 11:00:32 +0300 |
|---|---|---|
| committer | Efraim Flashner <efraim@flashner.co.il> | 2021-09-29 11:00:32 +0300 |
| commit | 8d02c2c39e647206482debf3ae943ae6198b1fd0 (patch) | |
| tree | f832a30c6a924f822348f2aef1853a88a20ddec1 /gnu/packages/patches/mariadb-cmake-compat.patch | |
| parent | b1ef2deb66f4794c96557801eca3808a61f1f218 (diff) | |
| download | guix-8d02c2c39e647206482debf3ae943ae6198b1fd0.tar.gz | |
gnu: mariadb: Update to 10.5.12.
* gnu/packages/databases.scm (mariadb): Update to 10.5.12. [source]: Remove patches. [arguments]: In custom 'adjust-tests phase, update list of skipped tests. Also remove tests already listed in mysql-test/unstable-tests. * gnu/packages/patches/mariadb-CVE-2021-27928.patch, gnu/packages/patches/mariadb-cmake-compat.patch: Remove files. * gnu/local.mk (dist_patch_DATA): Remove them.
Diffstat (limited to 'gnu/packages/patches/mariadb-cmake-compat.patch')
| -rw-r--r-- | gnu/packages/patches/mariadb-cmake-compat.patch | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/gnu/packages/patches/mariadb-cmake-compat.patch b/gnu/packages/patches/mariadb-cmake-compat.patch deleted file mode 100644 index 44b0daa186..0000000000 --- a/gnu/packages/patches/mariadb-cmake-compat.patch +++ /dev/null @@ -1,17 +0,0 @@ -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 |