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 @@ -124,7 +124,7 @@ ENDIF()
4 # get a list of rocksdb library source files
5 # run with env -i to avoid passing variables
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}
13 From 9dddf90bf54cfa29d14d199d19ad07d4590fbb1e Mon Sep 17 00:00:00 2001
14 From: Thomas Deutschmann <whissi@gentoo.org>
15 Date: Thu, 30 Apr 2020 22:55:34 +0200
16 Subject: [PATCH 2/8] cmake: Remove -Werror
18 Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
20 cmake/maintainer.cmake | 6 ------
21 1 file changed, 6 deletions(-)
23 diff --git a/cmake/maintainer.cmake b/cmake/maintainer.cmake
24 index 19db0d34f..3ed806be4 100644
25 --- a/cmake/maintainer.cmake
26 +++ b/cmake/maintainer.cmake
27 @@ -46,12 +46,6 @@ IF(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
28 "${MY_CXX_WARNING_FLAGS} -Wno-null-conversion -Wno-unused-private-field")
31 -# Turn on Werror (warning => error) when using maintainer mode.
32 -IF(MYSQL_MAINTAINER_MODE)
33 - SET(MY_C_WARNING_FLAGS "${MY_C_WARNING_FLAGS} -Werror")
34 - SET(MY_CXX_WARNING_FLAGS "${MY_CXX_WARNING_FLAGS} -Werror")
37 # Set warning flags for GCC/Clang
38 IF(CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID MATCHES "Clang")
39 SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${MY_C_WARNING_FLAGS}")
43 --- percona-server-5.7.30-33/storage/tokudb/PerconaFT/cmake_modules/TokuSetupCompiler.cmake~ 2020-05-13 23:04:03.000000000 +0200
44 +++ percona-server-5.7.30-33/storage/tokudb/PerconaFT/cmake_modules/TokuSetupCompiler.cmake 2020-05-24 18:33:01.759229294 +0200
45 @@ -170,10 +170,6 @@ if (NOT CMAKE_CXX_COMPILER_ID STREQUAL C
46 prepend_cflags_if_supported(-Wcast-align)
50 -set(CMAKE_C_FLAGS "-Wall -Werror ${CMAKE_C_FLAGS}")
51 -set(CMAKE_CXX_FLAGS "-Wall -Werror ${CMAKE_CXX_FLAGS}")
53 # pick language dialect
54 set(CMAKE_C_FLAGS "-std=c99 ${CMAKE_C_FLAGS}")
55 check_cxx_compiler_flag(-std=c++11 HAVE_STDCXX11)