--- storage/tokudb/CMakeLists.txt.orig	2014-11-21 15:02:53.000000000 -0600
+++ storage/tokudb/CMakeLists.txt	2015-01-31 22:43:35.959678148 -0600
@@ -1,5 +1,7 @@
 # ft-index only supports x86-64 and cmake-2.8.9+
-IF(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND
+IF((CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" OR
+    (CMAKE_SYSTEM_NAME STREQUAL "FreeBSD" AND
+     CMAKE_SYSTEM_PROCESSOR STREQUAL "amd64")) AND
     NOT CMAKE_VERSION VERSION_LESS "2.8.9")
 CHECK_CXX_SOURCE_COMPILES(
 "
--- storage/tokudb/ft-index/cmake_modules/TokuFeatureDetection.cmake.orig	2014-11-21 15:02:54.000000000 -0600
+++ storage/tokudb/ft-index/cmake_modules/TokuFeatureDetection.cmake	2015-01-31 22:43:35.959678148 -0600
@@ -116,7 +116,7 @@
 if (HAVE_PTHREAD_YIELD)
   include(CheckPrototypeDefinition)
 
-  check_prototype_definition(pthread_yield "void pthread_yield(void)" 0 "pthread.h" PTHREAD_YIELD_RETURNS_VOID)
+  check_prototype_definition(pthread_yield "void pthread_yield(void)" "(void)0" "pthread.h" PTHREAD_YIELD_RETURNS_VOID)
   check_c_source_compiles("#include <pthread.h>
 int main(void) {
   int r = pthread_yield();
--- storage/tokudb/ft-index/ft/CMakeLists.txt.orig	2014-11-21 15:02:54.000000000 -0600
+++ storage/tokudb/ft-index/ft/CMakeLists.txt	2015-01-31 22:43:35.959678148 -0600
@@ -9,7 +9,9 @@
 
 add_executable(logformat logger/logformat.cc)
 target_link_libraries(logformat ${LIBTOKUPORTABILITY}_static)
-add_space_separated_property(TARGET logformat LINK_FLAGS --coverage)
+if (USE_GCOV)
+  add_space_separated_property(TARGET logformat LINK_FLAGS --coverage)
+endif (USE_GCOV)
 
 
 add_custom_command(
--- storage/tokudb/ft-index/ft/serialize/block_allocator.h.orig	2014-11-21 15:02:55.000000000 -0600
+++ storage/tokudb/ft-index/ft/serialize/block_allocator.h	2015-01-31 22:43:35.959678148 -0600
@@ -96,6 +96,7 @@
 
 #include "portability/toku_pthread.h"
 #include "portability/toku_stdint.h"
+#include "portability/toku_stdlib.h"
 
 // Block allocator.
 //