From 4c81a5218361d75b0e06fb79a0578b428eedad87 Mon Sep 17 00:00:00 2001 From: Vsevolod Stakhov Date: Wed, 25 Dec 2019 13:05:01 +0000 Subject: [PATCH] [Minor] Remove enforced "-O3" from contrib libraries --- cmake/Toolset.cmake | 4 ++-- contrib/aho-corasick/CMakeLists.txt | 6 ------ contrib/fpconv/CMakeLists.txt | 5 ----- contrib/hiredis/CMakeLists.txt | 7 ------- contrib/http-parser/CMakeLists.txt | 5 ----- contrib/kann/CMakeLists.txt | 6 ------ contrib/lc-btrie/CMakeLists.txt | 5 ----- contrib/libev/CMakeLists.txt | 6 ------ contrib/libottery/CMakeLists.txt | 5 ----- contrib/lua-lpeg/CMakeLists.txt | 6 ------ contrib/t1ha/CMakeLists.txt | 6 ------ contrib/zstd/CMakeLists.txt | 6 ------ 12 files changed, 2 insertions(+), 65 deletions(-) diff --git a/cmake/Toolset.cmake b/cmake/Toolset.cmake index 8e7c1bb29..2d4460097 100644 --- a/cmake/Toolset.cmake +++ b/cmake/Toolset.cmake @@ -161,8 +161,8 @@ else () set (CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELEASE} -O2 ${COMPILER_FAST_MATH} ${COMPILER_DEBUG_FLAGS}") set (CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELEASE} -O2 ${COMPILER_FAST_MATH} ${COMPILER_DEBUG_FLAGS}") - set (CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -O1 ${COMPILER_FAST_MATH} ${COMPILER_DEBUG_FLAGS}") - set (CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -O1 ${COMPILER_FAST_MATH} ${COMPILER_DEBUG_FLAGS}") + set (CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -O0 ${COMPILER_FAST_MATH} ${COMPILER_DEBUG_FLAGS}") + set (CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -O0 ${COMPILER_FAST_MATH} ${COMPILER_DEBUG_FLAGS}") endif() diff --git a/contrib/aho-corasick/CMakeLists.txt b/contrib/aho-corasick/CMakeLists.txt index 93c51a146..2c431b5b8 100644 --- a/contrib/aho-corasick/CMakeLists.txt +++ b/contrib/aho-corasick/CMakeLists.txt @@ -1,12 +1,6 @@ SET(AHOCORASICSRC acism_create.c acism.c) -IF(ENABLE_FULL_DEBUG MATCHES "OFF") -if ("${CMAKE_C_COMPILER_ID}" STREQUAL "Clang" OR "${CMAKE_C_COMPILER_ID}" STREQUAL "GNU") - SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O3") -endif () -ENDIF() - IF(NOT GPL_RSPAMD_BINARY) ADD_LIBRARY(rspamd-actrie SHARED ${AHOCORASICSRC}) target_link_libraries(rspamd-actrie glib-2.0) diff --git a/contrib/fpconv/CMakeLists.txt b/contrib/fpconv/CMakeLists.txt index 0d27dbb7f..b3305250b 100644 --- a/contrib/fpconv/CMakeLists.txt +++ b/contrib/fpconv/CMakeLists.txt @@ -1,11 +1,6 @@ SET(FPCONVSRC fpconv.c) SET(FTPCONV_COMPILE_FLAGS "-DRSPAMD_LIB") -IF(ENABLE_FULL_DEBUG MATCHES "OFF") - if ("${CMAKE_C_COMPILER_ID}" STREQUAL "Clang" OR "${CMAKE_C_COMPILER_ID}" STREQUAL "GNU") - set(FTPCONV_COMPILE_FLAGS "${FTPCONV_COMPILE_FLAGS} -O3") - endif () -ENDIF() ADD_LIBRARY(rspamd-fpconv STATIC ${FPCONVSRC}) SET_TARGET_PROPERTIES(rspamd-fpconv PROPERTIES VERSION ${RSPAMD_VERSION}) diff --git a/contrib/hiredis/CMakeLists.txt b/contrib/hiredis/CMakeLists.txt index f8b233996..1e056319f 100644 --- a/contrib/hiredis/CMakeLists.txt +++ b/contrib/hiredis/CMakeLists.txt @@ -6,13 +6,6 @@ SET(HIREDISSRC async.c sds.c) SET(HIREDIS_CFLAGS "") - -IF(ENABLE_FULL_DEBUG MATCHES "OFF") -IF("${CMAKE_C_COMPILER_ID}" STREQUAL "Clang" OR "${CMAKE_C_COMPILER_ID}" STREQUAL "GNU") - SET(HIREDIS_CFLAGS "${HIREDIS_CFLAGS} -O3") -ENDIF() -ENDIF() - ADD_LIBRARY(rspamd-hiredis STATIC ${HIREDISSRC}) SET_TARGET_PROPERTIES(rspamd-hiredis PROPERTIES COMPILE_FLAGS "${HIREDIS_CFLAGS}") \ No newline at end of file diff --git a/contrib/http-parser/CMakeLists.txt b/contrib/http-parser/CMakeLists.txt index 499c85e93..a5da7010c 100644 --- a/contrib/http-parser/CMakeLists.txt +++ b/contrib/http-parser/CMakeLists.txt @@ -2,11 +2,6 @@ SET(HTTPSRC http_parser.c) SET(HTTP_COMPILE_FLAGS "-DRSPAMD_LIB") -IF(ENABLE_FULL_DEBUG MATCHES "OFF") -if ("${CMAKE_C_COMPILER_ID}" STREQUAL "Clang" OR "${CMAKE_C_COMPILER_ID}" STREQUAL "GNU") - set(HTTP_COMPILE_FLAGS "${HTTP_COMPILE_FLAGS} -O3") -endif () -ENDIF() ADD_LIBRARY(rspamd-http-parser STATIC ${HTTPSRC}) SET_TARGET_PROPERTIES(rspamd-http-parser PROPERTIES VERSION ${RSPAMD_VERSION}) diff --git a/contrib/kann/CMakeLists.txt b/contrib/kann/CMakeLists.txt index 2bf32c92e..b3a1d547c 100644 --- a/contrib/kann/CMakeLists.txt +++ b/contrib/kann/CMakeLists.txt @@ -1,11 +1,5 @@ SET(LIBKANNSRC kautodiff.c kann.c) -IF(ENABLE_FULL_DEBUG MATCHES "OFF") - if ("${CMAKE_C_COMPILER_ID}" STREQUAL "Clang" OR "${CMAKE_C_COMPILER_ID}" STREQUAL "GNU") - SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O3") - endif () -ENDIF() - ADD_LIBRARY(rspamd-kann SHARED ${LIBKANNSRC}) IF(WITH_BLAS) diff --git a/contrib/lc-btrie/CMakeLists.txt b/contrib/lc-btrie/CMakeLists.txt index b520bda86..a5fe9e53d 100644 --- a/contrib/lc-btrie/CMakeLists.txt +++ b/contrib/lc-btrie/CMakeLists.txt @@ -2,10 +2,5 @@ SET(LCTRIESRC btrie.c) ADD_LIBRARY(lcbtrie STATIC ${LCTRIESRC}) SET(LCTRIE_CFLAGS "-DBUILD_RSPAMD") -IF(ENABLE_FULL_DEBUG MATCHES "OFF") -if ("${CMAKE_C_COMPILER_ID}" STREQUAL "Clang" OR "${CMAKE_C_COMPILER_ID}" STREQUAL "GNU") - SET(LCTRIE_CFLAGS "${LCTRIE_CFLAGS} -O3") -endif () -ENDIF() set_target_properties(lcbtrie PROPERTIES COMPILE_FLAGS "${LCTRIE_CFLAGS}") \ No newline at end of file diff --git a/contrib/libev/CMakeLists.txt b/contrib/libev/CMakeLists.txt index e98ff126e..db380db95 100644 --- a/contrib/libev/CMakeLists.txt +++ b/contrib/libev/CMakeLists.txt @@ -47,12 +47,6 @@ CHECK_LIBRARY_EXISTS(rt clock_gettime "" HAVE_LIBRT) CHECK_LIBRARY_EXISTS(rt clock_gettime "" HAVE_CLOCK_GETTIME) CHECK_LIBRARY_EXISTS(m ceil "" HAVE_LIBM) -IF(ENABLE_FULL_DEBUG MATCHES "OFF") -if ("${CMAKE_C_COMPILER_ID}" STREQUAL "Clang" OR "${CMAKE_C_COMPILER_ID}" STREQUAL "GNU") - SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O3") -endif () -ENDIF() - CONFIGURE_FILE(config.h.in libev-config.h) ADD_LIBRARY(rspamd-ev SHARED ${LIBEVSRC}) diff --git a/contrib/libottery/CMakeLists.txt b/contrib/libottery/CMakeLists.txt index 84da8136a..b8536f2f1 100644 --- a/contrib/libottery/CMakeLists.txt +++ b/contrib/libottery/CMakeLists.txt @@ -8,9 +8,4 @@ SET(OTTERYSRC chacha_merged.c ADD_LIBRARY(ottery STATIC ${OTTERYSRC}) SET(OTTERY_CFLAGS "-DBUILD_RSPAMD -DOTTERY_NO_PID_CHECK -DOTTERY_NO_INIT_CHECK -DOTTERY_NO_WIPE_STACK") -IF(ENABLE_FULL_DEBUG MATCHES "OFF") -if ("${CMAKE_C_COMPILER_ID}" STREQUAL "Clang" OR "${CMAKE_C_COMPILER_ID}" STREQUAL "GNU") - SET(OTTERY_CFLAGS "${OTTERY_CFLAGS} -O3") -endif () -ENDIF() set_target_properties(ottery PROPERTIES COMPILE_FLAGS "${OTTERY_CFLAGS}") \ No newline at end of file diff --git a/contrib/lua-lpeg/CMakeLists.txt b/contrib/lua-lpeg/CMakeLists.txt index 2362aac9c..92dd0182d 100644 --- a/contrib/lua-lpeg/CMakeLists.txt +++ b/contrib/lua-lpeg/CMakeLists.txt @@ -4,12 +4,6 @@ SET(LPEGSRC lpcap.c lptree.c lpvm.c) -IF(ENABLE_FULL_DEBUG MATCHES "OFF") -if ("${CMAKE_C_COMPILER_ID}" STREQUAL "Clang" OR "${CMAKE_C_COMPILER_ID}" STREQUAL "GNU") - SET(LPEG_CFLAGS "${LPEG_CFLAGS} -O3") -endif () -ENDIF() - SET(LIB_TYPE STATIC) ADD_LIBRARY(rspamd-lpeg ${LIB_TYPE} ${LPEGSRC}) set_target_properties(rspamd-lpeg PROPERTIES COMPILE_FLAGS "${LPEG_CFLAGS}") diff --git a/contrib/t1ha/CMakeLists.txt b/contrib/t1ha/CMakeLists.txt index 491010ff9..c8de483f4 100644 --- a/contrib/t1ha/CMakeLists.txt +++ b/contrib/t1ha/CMakeLists.txt @@ -4,9 +4,3 @@ SET(T1HASRC t1ha1.c ADD_LIBRARY(rspamd-t1ha STATIC ${T1HASRC}) SET_TARGET_PROPERTIES(rspamd-t1ha PROPERTIES VERSION ${RSPAMD_VERSION}) ADD_DEFINITIONS("-DT1HA_USE_FAST_ONESHOT_READ=0") - -IF(ENABLE_FULL_DEBUG MATCHES "OFF") - if ("${CMAKE_C_COMPILER_ID}" STREQUAL "Clang" OR "${CMAKE_C_COMPILER_ID}" STREQUAL "GNU") - SET_TARGET_PROPERTIES(rspamd-t1ha PROPERTIES COMPILE_FLAGS "-O3") - endif () -ENDIF() diff --git a/contrib/zstd/CMakeLists.txt b/contrib/zstd/CMakeLists.txt index 2cccee0c1..120e179ba 100644 --- a/contrib/zstd/CMakeLists.txt +++ b/contrib/zstd/CMakeLists.txt @@ -22,9 +22,3 @@ SET(ZSTDSRC ADD_LIBRARY(rspamd-zstd STATIC ${ZSTDSRC}) ADD_DEFINITIONS(-DZSTD_STATIC_LINKING_ONLY) - -IF(ENABLE_FULL_DEBUG MATCHES "OFF") -if ("${CMAKE_C_COMPILER_ID}" STREQUAL "Clang" OR "${CMAKE_C_COMPILER_ID}" STREQUAL "GNU") - SET_TARGET_PROPERTIES(rspamd-zstd PROPERTIES COMPILE_FLAGS "-O3") -endif () -ENDIF() -- 2.39.5