3dae174e7e
- rebase 001-add-extra-check-for-librt.patch
- for changelog see [1], [2]
Fixes:
CMake Error at libmariadb/cmake/ConnectorName.cmake:30 (ENDMACRO):
Flow control statements are not properly nested.
Call Stack (most recent call first):
libmariadb/CMakeLists.txt:423 (INCLUDE)
[1] https://mariadb.com/kb/en/mariadb-10329-changelog/
[2] https://mariadb.com/kb/en/mariadb-10330-changelog/
Signed-off-by: Peter Seiderer <ps.report@gmx.net>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
32 lines
814 B
Diff
32 lines
814 B
Diff
From 960c74ec60962f707bd41724edaa2640c0324400 Mon Sep 17 00:00:00 2001
|
|
From: Ryan Coe <bluemrp9@gmail.com>
|
|
Date: Thu, 27 Oct 2016 20:33:21 -0700
|
|
Subject: [PATCH] add extra check for librt
|
|
|
|
https://jira.mariadb.org/browse/MDEV-10841
|
|
|
|
Signed-off-by: Ryan Coe <bluemrp9@gmail.com>
|
|
[Rebased on mariadb-10.3.30]
|
|
Signed-off-by: Peter Seiderer <ps.report@gmx.net>
|
|
---
|
|
configure.cmake | 3 +++
|
|
1 file changed, 3 insertions(+)
|
|
|
|
diff --git a/configure.cmake b/configure.cmake
|
|
index 1b85c31b..4a1cd847 100644
|
|
--- a/configure.cmake
|
|
+++ b/configure.cmake
|
|
@@ -134,6 +134,9 @@ IF(UNIX)
|
|
IF(NOT LIBRT)
|
|
MY_SEARCH_LIBS(clock_gettime rt LIBRT)
|
|
ENDIF()
|
|
+ IF(NOT LIBRT)
|
|
+ MY_SEARCH_LIBS(posix_spawn_file_actions_addclose rt LIBRT)
|
|
+ ENDIF()
|
|
set(THREADS_PREFER_PTHREAD_FLAG ON)
|
|
FIND_PACKAGE(Threads)
|
|
|
|
--
|
|
2.32.0
|
|
|