← Back to team overview

maria-developers team mailing list archive

Patch for atomics on MIPS in mroonga

 

Who should be contacted about issues in the mroonga storage engine?

The attached patch is from Debian Bug#838914

  https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=838914

Apparently, libatomic is needed on this platform to support 64-bit atomic
operations.

The patch looks reasonable and should probably be upstreamed. But I am not
sure how the mroonga storage engine is maintained - should this go directly
into MariaDB? If there is an upstream maintained mroonga storage engine,
probably it should preferably go there first?

 - Kristian.

Description: Ensure groonga is built with libatomic
 MIPS (and possibly other) platforms require linking against libatomic to
 support 64-bit atomic integers. Groonga was failing to do so and all related
 tests were failing with an atomics relocation error on MIPS.
Author: James Cowgill <jcowgill@xxxxxxxxxx>
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/storage/mroonga/vendor/groonga/CMakeLists.txt
+++ b/storage/mroonga/vendor/groonga/CMakeLists.txt
@@ -256,6 +256,8 @@ endmacro()
 include(build/ac_macros/check_headers.m4)
 include(build/ac_macros/check_functions.m4)
 
+ac_check_lib(atomic __atomic_store_8)
+
 ac_check_symbols(fpclassify math.h)
 ac_check_lib(m fpclassify)
 
--- a/storage/mroonga/vendor/groonga/lib/CMakeLists.txt
+++ b/storage/mroonga/vendor/groonga/lib/CMakeLists.txt
@@ -56,6 +56,7 @@ endif()
 set_target_properties(libgroonga PROPERTIES OUTPUT_NAME "groonga")
 
 set(GRN_ALL_LIBRARIES
+    ${ATOMIC_LIBS}
     ${EXECINFO_LIBS}
     ${RT_LIBS}
     ${PTHREAD_LIBS}

Follow ups