build.patch

   1 --- percona-server-5.7.29-32/storage/rocksdb/CMakeLists.txt~    2020-01-20 15:25:37.000000000 +0100
   2 +++ percona-server-5.7.29-32/storage/rocksdb/CMakeLists.txt     2020-02-17 10:50:15.600870732 +0100
   3 @@ -57,7 +57,7 @@ ELSE()
   4    # get a list of rocksdb library source files
   5    # run with env -i to avoid passing variables
   6    EXECUTE_PROCESS(
   7 -    COMMAND env -i ${CMAKE_CURRENT_SOURCE_DIR}/get_rocksdb_files.sh
   8 +    COMMAND env -i PATH=$ENV{PATH} ${CMAKE_CURRENT_SOURCE_DIR}/get_rocksdb_files.sh
   9      OUTPUT_VARIABLE SCRIPT_OUTPUT
  10      WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
  11    )
  12 From 9dddf90bf54cfa29d14d199d19ad07d4590fbb1e Mon Sep 17 00:00:00 2001
  13 From: Thomas Deutschmann <whissi@gentoo.org>
  14 Date: Thu, 30 Apr 2020 22:55:34 +0200
  15 Subject: [PATCH 2/8] cmake: Remove -Werror
  16
  17 Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
  18 ---
  19  cmake/maintainer.cmake | 6 ------
  20  1 file changed, 6 deletions(-)
  21
  22 diff --git a/cmake/maintainer.cmake b/cmake/maintainer.cmake
  23 index 19db0d34f..3ed806be4 100644
  24 --- a/cmake/maintainer.cmake
  25 +++ b/cmake/maintainer.cmake
  26 @@ -37,12 +37,6 @@ IF(CMAKE_CXX_COMPILER_ID MATCHES "Clang"
  27        "${MY_CXX_WARNING_FLAGS} -Wno-null-conversion -Wno-unused-private-field")
  28  ENDIF()
  29
  30 -# Turn on Werror (warning => error) when using maintainer mode.
  31 -IF(MYSQL_MAINTAINER_MODE)
  32 -  STRING_APPEND(MY_C_WARNING_FLAGS   " -Werror")
  33 -  STRING_APPEND(MY_CXX_WARNING_FLAGS " -Werror")
  34 -ENDIF()
  35 -
  36  # Set warning flags for GCC/Clang
  37  IF(CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID MATCHES "Clang")
  38    STRING_APPEND(CMAKE_C_FLAGS " ${MY_C_WARNING_FLAGS}")
  39 --- percona-server-5.7.30-33/storage/tokudb/PerconaFT/cmake_modules/TokuSetupCompiler.cmake~    2020-05-13 23:04:03.000000000 +0200
  40 +++ percona-server-5.7.30-33/storage/tokudb/PerconaFT/cmake_modules/TokuSetupCompiler.cmake     2020-05-24 18:33:01.759229294 +0200
  41 @@ -221,10 +221,6 @@ if (NOT CMAKE_CXX_COMPILER_ID STREQUAL C
  42    prepend_cflags_if_supported_remove_unsupported(-Wcast-align)
  43  endif ()
  44
  45 -## always want these
  46 -set(CMAKE_C_FLAGS "-Wall -Werror ${CMAKE_C_FLAGS}")
  47 -set(CMAKE_CXX_FLAGS "-Wall -Werror ${CMAKE_CXX_FLAGS}")
  48 -
  49  # pick language dialect
  50  set(CMAKE_C_FLAGS "-std=c99 ${CMAKE_C_FLAGS}")
  51  check_cxx_compiler_flag(-std=c++11 HAVE_STDCXX11)
  52