- Fix build with GCC 4.8

- Fix build on FreeBSD 9.X
- Fix build on i386

2 files changed, 29 insertions, 0 deletions

diff --git a/databases/tarantool/files/extra-patch-src_trivia_config.h.cmake b/databases/tarantool/files/extra-patch-src_trivia_config.h.cmake
new file mode 100644
index 000000000000..15ffb26126c5
--- /dev/null
+++ b/databases/tarantool/files/extra-patch-src_trivia_config.h.cmake
@@ -0,0 +1,16 @@
+--- src/trivia/config.h.cmake.orig	2015-05-15 14:01:37 UTC
++++ src/trivia/config.h.cmake
+@@ -21,6 +21,13 @@
+ #cmakedefine TARGET_OS_LINUX 1
+ /*  Defined if building for FreeBSD */
+ #cmakedefine TARGET_OS_FREEBSD 1
++#if defined(TARGET_OS_FREEBSD)
++/*
++ * Fix build with GCC 4.8 when _ThreadRuneLocale undeclared
++ * on FreeBSD.
++ */
++#define __RUNETYPE_INTERNAL
++#endif
+ /*  Defined if building for Darwin */
+ #cmakedefine TARGET_OS_DARWIN 1
+ /*
diff --git a/databases/tarantool/files/patch-cmake_compiler.cmake b/databases/tarantool/files/patch-cmake_compiler.cmake
new file mode 100644
index 000000000000..aadc2c84cb0e
--- /dev/null
+++ b/databases/tarantool/files/patch-cmake_compiler.cmake
@@ -0,0 +1,13 @@
+--- cmake/compiler.cmake.orig	2015-08-22 18:47:17 UTC
++++ cmake/compiler.cmake
+@@ -129,6 +129,10 @@ macro(enable_tnt_compile_flags)
+     if (CMAKE_COMPILER_IS_GNUCC)
+         # A workaround for Redhat Developer Toolset 2.x on RHEL/CentOS 5.x
+         add_compile_flags("C" "-fno-gnu89-inline")
++        if (NOT CMAKE_SIZEOF_VOID_P EQUAL 8)
++            add_compile_flags("C;CXX"
++	        "-march=i686")
++        endif()
+     endif()
+ 
+     add_definitions("-D__STDC_FORMAT_MACROS=1")