--- ./CMakeLists.txt.orig	2015-09-17 15:47:59.794784111 -0400
+++ ./CMakeLists.txt	2015-09-19 19:42:16.751348473 -0400
@@ -362,10 +376,10 @@
 
 CHECK_PCRE()
 
-IF(CMAKE_CROSSCOMPILING)
-  SET(IMPORT_EXECUTABLES "IMPORTFILE-NOTFOUND" CACHE FILEPATH "Path to import_executables.cmake from a native build")
-  INCLUDE(${IMPORT_EXECUTABLES})
-ENDIF()
+# IF(CMAKE_CROSSCOMPILING)
+#   SET(IMPORT_EXECUTABLES "IMPORTFILE-NOTFOUND" CACHE FILEPATH "Path to import_executables.cmake from a native build")
+#   INCLUDE(${IMPORT_EXECUTABLES})
+# ENDIF()
 
 #
 # Setup maintainer mode options. Platform checks are

--- ./storage/xtradb/CMakeLists.txt.orig	2015-09-17 11:17:04.967280099 -0400
+++ ./storage/xtradb/CMakeLists.txt	2015-09-17 11:18:58.011276650 -0400
@@ -455,12 +455,13 @@
   SET(WITH_INNOBASE_STORAGE_ENGINE TRUE)
 ENDIF()
 
-IF(XTRADB_OK)
-  MYSQL_ADD_PLUGIN(xtradb ${INNOBASE_SOURCES} STORAGE_ENGINE
-    DEFAULT
-    RECOMPILE_FOR_EMBEDDED
-    LINK_LIBRARIES ${ZLIB_LIBRARY} ${LINKER_SCRIPT})
-ELSE()
-  MESSAGE(FATAL_ERROR "Percona XtraDB is not supported on this platform")
+IF(WITH_XTRADB)
+  IF(XTRADB_OK)
+    MYSQL_ADD_PLUGIN(xtradb ${INNOBASE_SOURCES} STORAGE_ENGINE
+  	DEFAULT
+  	RECOMPILE_FOR_EMBEDDED
+  	LINK_LIBRARIES ${ZLIB_LIBRARY} ${LINKER_SCRIPT})
+  ELSE()
+    MESSAGE(FATAL_ERROR "Percona XtraDB is not supported on this platform")
+  ENDIF()
 ENDIF()
-

--- ./storage/innobase/CMakeLists.txt.orig	2015-09-18 21:28:54.446428704 -0400
+++ ./storage/innobase/CMakeLists.txt	2015-09-18 21:40:24.987436643 -0400
@@ -15,6 +15,10 @@
 
 # This is the CMakeLists for InnoDB
 
+IF(NOT WITH_INNOBASE_STORAGE_ENGINE)
+  RETURN()
+ENDIF()
+
 INCLUDE(CheckFunctionExists)
 INCLUDE(CheckCSourceCompiles)
 INCLUDE(CheckCSourceRuns)

--- ./storage/tokudb/ft-index/cmake_modules/TokuFeatureDetection.cmake.orig	2015-09-19 21:44:36.724432860 -0400
+++ ./storage/tokudb/ft-index/cmake_modules/TokuFeatureDetection.cmake	2015-09-19 21:45:58.880433804 -0400
@@ -92,7 +92,7 @@
   if (HAVE_BACKTRACE_WITH_EXECINFO)
     list(APPEND EXTRA_SYSTEM_LIBS execinfo)
   else ()
-    message(FATAL_ERROR "Cannot find backtrace(), even with -lexecinfo.")
+    message(WARNING "Cannot find backtrace(), even with -lexecinfo.")
   endif ()
 endif ()