Skip to content

Commit b90a36a

Browse files
committed
mariadb: ensure groonga is build with libatomic
Signed-off-by: Mathieu Malaterre <[email protected]>
1 parent d0abd53 commit b90a36a

File tree

1 file changed

+28
-0
lines changed

1 file changed

+28
-0
lines changed
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
Description: Ensure groonga is built with libatomic
2+
MIPS (and possibly other) platforms require linking against libatomic to
3+
support 64-bit atomic integers. Groonga was failing to do so and all related
4+
tests were failing with an atomics relocation error on MIPS.
5+
Author: James Cowgill <[email protected]>
6+
---
7+
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
8+
--- a/storage/mroonga/vendor/groonga/CMakeLists.txt
9+
+++ b/storage/mroonga/vendor/groonga/CMakeLists.txt
10+
@@ -234,6 +234,8 @@ endmacro()
11+
include(build/ac_macros/check_headers.m4)
12+
include(build/ac_macros/check_functions.m4)
13+
14+
+ac_check_lib(atomic __atomic_store_8)
15+
+
16+
ac_check_symbols(fpclassify math.h)
17+
ac_check_lib(m fpclassify)
18+
19+
--- a/storage/mroonga/vendor/groonga/lib/CMakeLists.txt
20+
+++ b/storage/mroonga/vendor/groonga/lib/CMakeLists.txt
21+
@@ -62,6 +62,7 @@ endif()
22+
set_target_properties(libgroonga PROPERTIES OUTPUT_NAME "groonga")
23+
24+
set(GRN_ALL_LIBRARIES
25+
+ ${ATOMIC_LIBS}
26+
${EXECINFO_LIBS}
27+
${RT_LIBS}
28+
${PTHREAD_LIBS}

0 commit comments

Comments
 (0)