diff -ur percona-server-5.7.28-31.orig/extra/libevent/CMakeLists.txt percona-server-5.7.28-31/extra/libevent/CMakeLists.txt --- percona-server-5.7.28-31.orig/extra/libevent/CMakeLists.txt 2019-12-17 21:48:18.087000000 +0100 +++ percona-server-5.7.28-31/extra/libevent/CMakeLists.txt 2019-12-17 21:54:31.973000000 +0100 @@ -301,7 +301,6 @@ CHECK_INCLUDE_FILE(netinet/tcp.h EVENT__HAVE_NETINET_TCP_H) CHECK_INCLUDE_FILE(sys/wait.h EVENT__HAVE_SYS_WAIT_H) CHECK_INCLUDE_FILE(sys/resource.h EVENT__HAVE_SYS_RESOURCE_H) -CHECK_INCLUDE_FILE(sys/sysctl.h EVENT__HAVE_SYS_SYSCTL_H) CHECK_INCLUDE_FILE(sys/timerfd.h EVENT__HAVE_SYS_TIMERFD_H) CHECK_INCLUDE_FILE(errno.h EVENT__HAVE_ERRNO_H) @@ -421,10 +420,6 @@ endif() CHECK_SYMBOL_EXISTS(TAILQ_FOREACH sys/queue.h EVENT__HAVE_TAILQFOREACH) -CHECK_SYMBOL_EXISTS(CTL_KERN sys/sysctl.h EVENT__HAVE_DECL_CTL_KERN) -CHECK_SYMBOL_EXISTS(KERN_ARND sys/sysctl.h EVENT__HAVE_DECL_KERN_ARND) -CHECK_SYMBOL_EXISTS(KERN_RANDOM sys/sysctl.h EVENT__HAVE_DECL_KERN_RANDOM) -CHECK_SYMBOL_EXISTS(RANDOM_UUID sys/sysctl.h EVENT__HAVE_DECL_RANDOM_UUID) CHECK_SYMBOL_EXISTS(F_SETFD fcntl.h EVENT__HAVE_SETFD) CHECK_TYPE_SIZE(fd_mask EVENT__HAVE_FD_MASK) diff -ur percona-server-5.7.28-31.orig/extra/libevent/arc4random.c percona-server-5.7.28-31/extra/libevent/arc4random.c --- percona-server-5.7.28-31.orig/extra/libevent/arc4random.c 2019-12-17 21:48:18.100000000 +0100 +++ percona-server-5.7.28-31/extra/libevent/arc4random.c 2019-12-17 21:52:02.967000000 +0100 @@ -59,9 +59,6 @@ #include #include #include -#ifdef EVENT__HAVE_SYS_SYSCTL_H -#include -#endif #endif #include #include diff -ur percona-server-5.7.28-31.orig/extra/libevent/event-config.h.cmake percona-server-5.7.28-31/extra/libevent/event-config.h.cmake --- percona-server-5.7.28-31.orig/extra/libevent/event-config.h.cmake 2019-12-17 21:48:18.108000000 +0100 +++ percona-server-5.7.28-31/extra/libevent/event-config.h.cmake 2019-12-17 21:51:46.329000000 +0100 @@ -355,9 +355,6 @@ /* Define to 1 if you have the header file. */ #cmakedefine EVENT__HAVE_SYS_STAT_H -/* Define to 1 if you have the header file. */ -#cmakedefine EVENT__HAVE_SYS_SYSCTL_H - /* Define to 1 if you have the header file. */ #cmakedefine EVENT__HAVE_SYS_TIMERFD_H */ diff -ur percona-server-5.7.28-31.orig/mysys/my_gethwaddr.c percona-server-5.7.28-31/mysys/my_gethwaddr.c --- percona-server-5.7.28-31.orig/mysys/my_gethwaddr.c 2019-12-17 21:48:35.390000000 +0100 +++ percona-server-5.7.28-31/mysys/my_gethwaddr.c 2019-12-17 21:52:16.332000000 +0100 @@ -37,7 +37,6 @@ #ifdef __FreeBSD__ #include -#include #include #include #include diff -ur percona-server-5.7.28-31.orig/storage/rocksdb/third_party/zstd/programs/util.h percona-server-5.7.28-31/storage/rocksdb/third_party/zstd/programs/util.h --- percona-server-5.7.28-31.orig/storage/rocksdb/third_party/zstd/programs/util.h 2019-12-17 21:48:46.381000000 +0100 +++ percona-server-5.7.28-31/storage/rocksdb/third_party/zstd/programs/util.h 2019-12-17 21:52:21.624000000 +0100 @@ -565,8 +565,6 @@ #elif defined(__APPLE__) -#include - /* Use apple-provided syscall * see: man 3 sysctl */ UTIL_STATIC int UTIL_countPhysicalCores(void) diff -ur percona-server-5.7.28-31.orig/storage/tokudb/PerconaFT/cmake_modules/TokuFeatureDetection.cmake percona-server-5.7.28-31/storage/tokudb/PerconaFT/cmake_modules/TokuFeatureDetection.cmake --- percona-server-5.7.28-31.orig/storage/tokudb/PerconaFT/cmake_modules/TokuFeatureDetection.cmake 2019-12-17 21:48:46.448000000 +0100 +++ percona-server-5.7.28-31/storage/tokudb/PerconaFT/cmake_modules/TokuFeatureDetection.cmake 2019-12-17 21:52:26.013000000 +0100 @@ -39,7 +39,6 @@ check_include_files(sys/resource.h HAVE_SYS_RESOURCE_H) check_include_files(sys/statvfs.h HAVE_SYS_STATVFS_H) check_include_files(sys/syscall.h HAVE_SYS_SYSCALL_H) -check_include_files(sys/sysctl.h HAVE_SYS_SYSCTL_H) check_include_files(sys/syslimits.h HAVE_SYS_SYSLIMITS_H) check_include_files(sys/time.h HAVE_SYS_TIME_H) check_include_files(unistd.h HAVE_UNISTD_H) diff -ur percona-server-5.7.28-31.orig/storage/tokudb/PerconaFT/portability/portability.cc percona-server-5.7.28-31/storage/tokudb/PerconaFT/portability/portability.cc --- percona-server-5.7.28-31.orig/storage/tokudb/PerconaFT/portability/portability.cc 2019-12-17 21:48:46.875000000 +0100 +++ percona-server-5.7.28-31/storage/tokudb/PerconaFT/portability/portability.cc 2019-12-17 21:52:31.280000000 +0100 @@ -60,9 +60,6 @@ #if defined(HAVE_SYS_SYSCALL_H) # include #endif -#if defined(HAVE_SYS_SYSCTL_H) -# include -#endif #if defined(HAVE_PTHREAD_NP_H) # include #endif diff -ur percona-server-5.7.28-31.orig/storage/tokudb/PerconaFT/third_party/xz-4.999.9beta/config.h.in percona-server-5.7.28-31/storage/tokudb/PerconaFT/third_party/xz-4.999.9beta/config.h.in --- percona-server-5.7.28-31.orig/storage/tokudb/PerconaFT/third_party/xz-4.999.9beta/config.h.in 2019-12-17 21:48:47.681000000 +0100 +++ percona-server-5.7.28-31/storage/tokudb/PerconaFT/third_party/xz-4.999.9beta/config.h.in 2019-12-17 21:52:35.576000000 +0100 @@ -231,9 +231,6 @@ /* Define to 1 if you have the header file. */ #undef HAVE_SYS_STAT_H -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_SYSCTL_H - /* Define to 1 if you have the header file. */ #undef HAVE_SYS_TIME_H diff -ur percona-server-5.7.28-31.orig/storage/tokudb/PerconaFT/third_party/xz-4.999.9beta/configure percona-server-5.7.28-31/storage/tokudb/PerconaFT/third_party/xz-4.999.9beta/configure --- percona-server-5.7.28-31.orig/storage/tokudb/PerconaFT/third_party/xz-4.999.9beta/configure 2019-12-17 21:48:47.683000000 +0100 +++ percona-server-5.7.28-31/storage/tokudb/PerconaFT/third_party/xz-4.999.9beta/configure 2019-12-17 21:53:41.227000000 +0100 @@ -16181,7 +16181,7 @@ -for ac_header in sys/param.h sys/sysctl.h byteswap.h +for ac_header in sys/param.h byteswap.h do as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 @@ -19545,7 +19545,6 @@ #ifdef HAVE_SYS_PARAM_H # include #endif -#include int main(void) { @@ -19723,7 +19722,6 @@ #ifdef HAVE_SYS_PARAM_H # include #endif -#include int main(void) { diff -ur percona-server-5.7.28-31.orig/storage/tokudb/PerconaFT/third_party/xz-4.999.9beta/configure.ac percona-server-5.7.28-31/storage/tokudb/PerconaFT/third_party/xz-4.999.9beta/configure.ac --- percona-server-5.7.28-31.orig/storage/tokudb/PerconaFT/third_party/xz-4.999.9beta/configure.ac 2019-12-17 21:48:47.684000000 +0100 +++ percona-server-5.7.28-31/storage/tokudb/PerconaFT/third_party/xz-4.999.9beta/configure.ac 2019-12-17 21:52:47.585000000 +0100 @@ -476,7 +476,7 @@ [AC_MSG_ERROR([Required header file(s) are missing.])]) # If any of these headers are missing, things should still work correctly: -AC_CHECK_HEADERS([sys/param.h sys/sysctl.h byteswap.h], +AC_CHECK_HEADERS([sys/param.h byteswap.h], [], [], [ #ifdef HAVE_SYS_PARAM_H # include diff -ur percona-server-5.7.28-31.orig/storage/tokudb/PerconaFT/third_party/xz-4.999.9beta/m4/lc_cpucores.m4 percona-server-5.7.28-31/storage/tokudb/PerconaFT/third_party/xz-4.999.9beta/m4/lc_cpucores.m4 --- percona-server-5.7.28-31.orig/storage/tokudb/PerconaFT/third_party/xz-4.999.9beta/m4/lc_cpucores.m4 2019-12-17 21:48:47.579000000 +0100 +++ percona-server-5.7.28-31/storage/tokudb/PerconaFT/third_party/xz-4.999.9beta/m4/lc_cpucores.m4 2019-12-17 21:53:59.770000000 +0100 @@ -36,7 +36,6 @@ #ifdef HAVE_SYS_PARAM_H # include #endif -#include int main(void) { diff -ur percona-server-5.7.28-31.orig/storage/tokudb/PerconaFT/third_party/xz-4.999.9beta/m4/lc_physmem.m4 percona-server-5.7.28-31/storage/tokudb/PerconaFT/third_party/xz-4.999.9beta/m4/lc_physmem.m4 --- percona-server-5.7.28-31.orig/storage/tokudb/PerconaFT/third_party/xz-4.999.9beta/m4/lc_physmem.m4 2019-12-17 21:48:47.579000000 +0100 +++ percona-server-5.7.28-31/storage/tokudb/PerconaFT/third_party/xz-4.999.9beta/m4/lc_physmem.m4 2019-12-17 21:54:05.009000000 +0100 @@ -38,7 +38,6 @@ #ifdef HAVE_SYS_PARAM_H # include #endif -#include int main(void) { diff -ur percona-server-5.7.28-31.orig/storage/tokudb/PerconaFT/third_party/xz-4.999.9beta/src/common/cpucores.h percona-server-5.7.28-31/storage/tokudb/PerconaFT/third_party/xz-4.999.9beta/src/common/cpucores.h --- percona-server-5.7.28-31.orig/storage/tokudb/PerconaFT/third_party/xz-4.999.9beta/src/common/cpucores.h 2019-12-17 21:48:47.584000000 +0100 +++ percona-server-5.7.28-31/storage/tokudb/PerconaFT/third_party/xz-4.999.9beta/src/common/cpucores.h 2019-12-17 21:53:53.793000000 +0100 @@ -22,9 +22,6 @@ # ifdef HAVE_SYS_PARAM_H # include # endif -# ifdef HAVE_SYS_SYSCTL_H -# include -# endif #endif diff -ur percona-server-5.7.28-31.orig/storage/tokudb/PerconaFT/third_party/xz-4.999.9beta/src/common/physmem.h percona-server-5.7.28-31/storage/tokudb/PerconaFT/third_party/xz-4.999.9beta/src/common/physmem.h --- percona-server-5.7.28-31.orig/storage/tokudb/PerconaFT/third_party/xz-4.999.9beta/src/common/physmem.h 2019-12-17 21:48:47.584000000 +0100 +++ percona-server-5.7.28-31/storage/tokudb/PerconaFT/third_party/xz-4.999.9beta/src/common/physmem.h 2019-12-17 21:53:47.514000000 +0100 @@ -31,9 +31,6 @@ # ifdef HAVE_SYS_PARAM_H # include # endif -# ifdef HAVE_SYS_SYSCTL_H -# include -# endif #elif defined(HAVE_PHYSMEM_SYSINFO) # include