Skip to content

Commit

Permalink
fix mysql-client RelWithDebInfo build args
Browse files Browse the repository at this point in the history
  • Loading branch information
mirostauder committed Nov 25, 2023
1 parent 4d614cf commit 1bcca12
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 32 deletions.
5 changes: 2 additions & 3 deletions test/deps/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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/

Expand Down
16 changes: 0 additions & 16 deletions test/deps/mysql-connector-c/CMakeLists.txt.patch

This file was deleted.

13 changes: 0 additions & 13 deletions test/deps/mysql-connector-c/install_macros.cmake.patch

This file was deleted.

0 comments on commit 1bcca12

Please sign in to comment.