diff --git a/test/deps/Makefile b/test/deps/Makefile index b75678170d..75a44663ad 100644 --- a/test/deps/Makefile +++ b/test/deps/Makefile @@ -35,9 +35,8 @@ mysql-connector-c/mysql-connector-c/libmysql/libmysqlclient.a: cd mysql-connector-c && rm -rf mysql-*/ || true cd mysql-connector-c && tar -zxf mysql-boost-5.7.*.tar.gz cd mysql-connector-c && ln -fsT $$(ls -1d mysql-5.7.*/) mysql-connector-c -# cd mysql-connector-c/mysql-connector-c && patch -p0 < ../CMakeLists.txt.patch -# cd mysql-connector-c/mysql-connector-c && patch -p0 < ../install_macros.cmake.patch - cd mysql-connector-c/mysql-connector-c && cmake . -DWITH_BOOST=./boost -DCMAKE_BUILD_TYPE=RelWithDebInfo -DOPENSSL_ROOT_DIR=$(DEPS_PATH)/libssl/openssl + cd mysql-connector-c/mysql-connector-c && cmake . -DWITH_BOOST=./boost -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_CXX_FLAGS_RELWITHDEBINFO="-O0 -ggdb -DNDEBUG -fPIC" -DOPENSSL_ROOT_DIR=$(DEPS_PATH)/libssl/openssl +# cd mysql-connector-c/mysql-connector-c && cmake . -DWITH_BOOST=./boost -DCMAKE_BUILD_TYPE=Debug -DCMAKE_CXX_FLAGS_DEBUG="-O0 -ggdb -fPIC" -DOPENSSL_ROOT_DIR=$(DEPS_PATH)/libssl/openssl cd mysql-connector-c/mysql-connector-c && CC=${CC} CXX=${CXX} ${MAKE} mysqlclient mysql cd mysql-connector-c/mysql-connector-c && cp archive_output_directory/libmysqlclient.a libmysql/ diff --git a/test/deps/mysql-connector-c/CMakeLists.txt.patch b/test/deps/mysql-connector-c/CMakeLists.txt.patch deleted file mode 100644 index e1e614370c..0000000000 --- a/test/deps/mysql-connector-c/CMakeLists.txt.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- ./CMakeLists.txt 2017-07-13 06:55:32.000000000 +0000 -+++ ./CMakeLists.txt 2023-10-30 15:24:21.614898571 +0000 -@@ -262,11 +262,11 @@ - SET(CMAKE_C_FLAGS_DEBUG - "${CMAKE_C_FLAGS_DEBUG} ${SAN_OPT} -O1 -Wno-error -fPIC") - SET(CMAKE_C_FLAGS_RELWITHDEBINFO -- "${CMAKE_C_FLAGS_RELWITHDEBINFO} ${SAN_OPT} -fPIC") -+ "${CMAKE_C_FLAGS_RELWITHDEBINFO} ${SAN_OPT} -O0 -ggdb -fPIC") - SET(CMAKE_CXX_FLAGS_DEBUG - "${CMAKE_CXX_FLAGS_DEBUG} ${SAN_OPT} -O1 -Wno-error -fPIC") - SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO -- "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} ${SAN_OPT} -fPIC") -+ "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} ${SAN_OPT} -O0 -ggdb -fPIC") - SET(${RESULT} 1) - ELSE() - SET(${RESULT} 0) diff --git a/test/deps/mysql-connector-c/install_macros.cmake.patch b/test/deps/mysql-connector-c/install_macros.cmake.patch deleted file mode 100644 index f6712d89f0..0000000000 --- a/test/deps/mysql-connector-c/install_macros.cmake.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- cmake/install_macros.cmake 2017-07-13 06:55:32.000000000 +0000 -+++ cmake/install_macros.cmake 2023-10-30 14:41:22.788965914 +0000 -@@ -362,8 +362,8 @@ - CONFIGURATIONS Release RelWithDebInfo - COMPONENT ${ARG_COMPONENT} - OPTIONAL) -- ENDIF() -- ENDFOREACH() -+ ENDFOREACH() -+ ENDIF() - - ENDFUNCTION() -