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