Index: mariadb-10.1-10.1.23/cmake/package_name.cmake
===================================================================
--- mariadb-10.1-10.1.23.orig/cmake/package_name.cmake
+++ mariadb-10.1-10.1.23/cmake/package_name.cmake
@@ -81,6 +81,9 @@ IF(NOT VERSION)
           SET(DEFAULT_MACHINE "i386")
         ENDIF()
       ENDIF()
+    ELSEIF(CMAKE_SYSTEM_NAME MATCHES "GNU")
+      SET(DEFAULT_PLATFORM "GNU")
+      SET(DEFAULT_MACHINE "i386")
     ELSEIF(CMAKE_SYSTEM_NAME MATCHES "Darwin")
       IF(CMAKE_OSX_DEPLOYMENT_TARGET)
         SET(DEFAULT_PLATFORM "osx${CMAKE_OSX_DEPLOYMENT_TARGET}")
Index: mariadb-10.1-10.1.23/cmake/dtrace.cmake
===================================================================
--- mariadb-10.1-10.1.23.orig/cmake/dtrace.cmake
+++ mariadb-10.1-10.1.23/cmake/dtrace.cmake
@@ -45,6 +45,10 @@ MACRO(CHECK_DTRACE)
      AND NOT BUGGY_LINUX_DTRACE) 
    SET(ENABLE_DTRACE ON CACHE BOOL "Enable dtrace")
  ENDIF()
+ # On GNU/Hurd, dtrace is not supported
+ IF(DTRACE AND CMAKE_SYSTEM_NAME MATCHES "GNU")
+   SET(ENABLE_DTRACE OFF CACHE BOOL "Disable dtrace")
+ ENDIF()
  SET(HAVE_DTRACE ${ENABLE_DTRACE})
  IF(CMAKE_SYSTEM_NAME MATCHES "SunOS")
    IF(CMAKE_SIZEOF_VOID_P EQUAL 4)
Index: mariadb-10.1-10.1.23/storage/mroonga/vendor/groonga/config.h.cmake
===================================================================
--- mariadb-10.1-10.1.23.orig/storage/mroonga/vendor/groonga/config.h.cmake
+++ mariadb-10.1-10.1.23/storage/mroonga/vendor/groonga/config.h.cmake
@@ -109,6 +109,7 @@
 #cmakedefine HAVE_STRING_H
 #cmakedefine HAVE_SYS_MMAN_H
 #cmakedefine HAVE_SYS_PARAM_H
+#cmakedefine HAVE_SYS_POLL_H
 #cmakedefine HAVE_SYS_RESOURCE_H
 #cmakedefine HAVE_SYS_SELECT_H
 #cmakedefine HAVE_SYS_SOCKET_H