amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: CMake: Update to 3.20.2.

Browse source 
* 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.
This commit is contained in:
Marius Bakke 2021-05-09 14:38:36 +02:00
parent 9e729d9a2f
commit 1539af46d0
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
4 changed files with 55 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

17
gnu/packages/patches/mariadb-cmake-compat.patch Normal file
View file

@ -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}")