diff options
| author | Efraim Flashner <efraim@flashner.co.il> | 2021-12-19 15:15:11 +0200 |
|---|---|---|
| committer | Efraim Flashner <efraim@flashner.co.il> | 2021-12-19 15:15:11 +0200 |
| commit | 6ccf8ea81f95963c0b7f945648106576008ee105 (patch) | |
| tree | f39f596e6c3e98ff1e9f1de0ad41c977e9dd37c1 /gnu/packages/patches/mariadb-cmake-compat.patch | |
| parent | fcaed5b81e893f34d77527fbef389ca628ca882d (diff) | |
| parent | 9f916d14765b00309c742fcbff0cfabdd10dcf05 (diff) | |
Merge branch 'master' into core-updates
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 |