build.patch

   1 diff -ur percona-server-5.7.35-38.orig/cmake/maintainer.cmake percona-server-5.7.35-38/cmake/maintainer.cmake
   2 --- percona-server-5.7.35-38.orig/cmake/maintainer.cmake        2021-11-25 00:03:41.234897661 +0100
   3 +++ percona-server-5.7.35-38/cmake/maintainer.cmake     2021-11-25 00:05:01.649091453 +0100
   4 @@ -37,12 +37,6 @@
   5        "${MY_CXX_WARNING_FLAGS} -Wno-null-conversion -Wno-unused-private-field")
   6  ENDIF()
   7
   8 -# Turn on Werror (warning => error) when using maintainer mode.
   9 -IF(MYSQL_MAINTAINER_MODE)
  10 -  STRING_APPEND(MY_C_WARNING_FLAGS   " -Werror")
  11 -  STRING_APPEND(MY_CXX_WARNING_FLAGS " -Werror")
  12 -ENDIF()
  13 -
  14  # Set warning flags for GCC/Clang
  15  IF(CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID MATCHES "Clang")
  16    STRING_APPEND(CMAKE_C_FLAGS " ${MY_C_WARNING_FLAGS}")
  17 diff -ur percona-server-5.7.35-38.orig/storage/rocksdb/CMakeLists.txt percona-server-5.7.35-38/storage/rocksdb/CMakeLists.txt
  18 --- percona-server-5.7.35-38.orig/storage/rocksdb/CMakeLists.txt        2021-11-25 00:03:45.359907607 +0100
  19 +++ percona-server-5.7.35-38/storage/rocksdb/CMakeLists.txt     2021-11-25 00:04:04.352953376 +0100
  20 @@ -57,7 +57,7 @@
  21    # get a list of rocksdb library source files
  22    # run with env -i to avoid passing variables
  23    EXECUTE_PROCESS(
  24 -    COMMAND env -i ${CMAKE_CURRENT_SOURCE_DIR}/get_rocksdb_files.sh
  25 +    COMMAND env -i PATH=$ENV{PATH} ${CMAKE_CURRENT_SOURCE_DIR}/get_rocksdb_files.sh
  26      OUTPUT_VARIABLE SCRIPT_OUTPUT
  27      WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
  28    )
  29 diff -ur percona-server-5.7.35-38.orig/storage/tokudb/PerconaFT/cmake_modules/TokuSetupCompiler.cmake percona-server-5.7.35-38/storage/tokudb/PerconaFT/cmake_modules/TokuSetupCompiler.cmake
  30 --- percona-server-5.7.35-38.orig/storage/tokudb/PerconaFT/cmake_modules/TokuSetupCompiler.cmake        2021-11-25 00:03:46.402910121 +0100
  31 +++ percona-server-5.7.35-38/storage/tokudb/PerconaFT/cmake_modules/TokuSetupCompiler.cmake     2021-11-25 00:04:04.352953376 +0100
  32 @@ -221,10 +221,6 @@
  33    prepend_cflags_if_supported_remove_unsupported(-Wcast-align)
  34  endif ()
  35
  36 -## always want these
  37 -set(CMAKE_C_FLAGS "-Wall -Werror ${CMAKE_C_FLAGS}")
  38 -set(CMAKE_CXX_FLAGS "-Wall -Werror ${CMAKE_CXX_FLAGS}")
  39 -
  40  # pick language dialect
  41  set(CMAKE_C_FLAGS "-std=c99 ${CMAKE_C_FLAGS}")
  42  check_cxx_compiler_flag(-std=c++11 HAVE_STDCXX11)