-
Notifications
You must be signed in to change notification settings - Fork 976
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
add external test deps to the main repo
- Loading branch information
1 parent
8ade3a6
commit 0a16a9c
Showing
14 changed files
with
180 additions
and
69 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,48 @@ | ||
#!/bin/make -f | ||
|
||
|
||
targets := mariadb_client mysql_client | ||
|
||
.PHONY: default | ||
default: $(targets) | ||
|
||
|
||
### test deps targets | ||
|
||
mariadb-connector-c/mariadb-connector-c/libmariadb/libmariadbclient.a: | ||
cd mariadb-connector-c && rm -rf mariadb-connector-c-*/ || true | ||
cd mariadb-connector-c && tar -zxf mariadb-connector-c-*.tar.gz | ||
cd mariadb-connector-c/mariadb-connector-c && patch -p0 < ../CMakeLists.txt.patch | ||
cd mariadb-connector-c/mariadb-connector-c && patch -p0 < ../ConnectorName.cmake.patch | ||
cd mariadb-connector-c/mariadb-connector-c && cmake . -DCMAKE_BUILD_TYPE=RelWithDebInfo -DOPENSSL_ROOT_DIR=$(DEPS_PATH)/libssl/openssl/ | ||
cd mariadb-connector-c/mariadb-connector-c && CC=${CC} CXX=${CXX} ${MAKE} mariadbclient | ||
|
||
mariadb_client: mariadb-connector-c/mariadb-connector-c/libmariadb/libmariadbclient.a | ||
|
||
|
||
mysql-connector-c/mysql-connector-c/libmysql/libmysqlclient.a: | ||
cd mysql-connector-c && rm -rf mysql-connector-c-*-src/ || true | ||
cd mysql-connector-c && tar -zxf mysql-connector-c-*-src.tar.gz | ||
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 . -DCMAKE_BUILD_TYPE=RelWithDebInfo -DOPENSSL_ROOT_DIR=$(DEPS_PATH)/libssl/openssl | ||
cd mysql-connector-c/mysql-connector-c && CC=${CC} CXX=${CXX} ${MAKE} mysqlclient | ||
|
||
mysql_client: mysql-connector-c/mysql-connector-c/libmysql/libmysqlclient.a | ||
|
||
|
||
### clean targets | ||
|
||
.SILENT: cleanall | ||
.PHONY: cleanall | ||
cleanall: | ||
cd mariadb-connector-c && rm -rf mariadb-connector-c-*/ || true | ||
cd mysql-connector-c && rm -rf mysql-connector-c-*-src/ || true | ||
|
||
.SILENT: clean | ||
.PHONY: clean | ||
clean: | ||
cd mariadb-connector-c/mariadb-connector-c && $(MAKE) clean || true | ||
cd mariadb-connector-c/mariadb-connector-c && rm -f CMakeCache.txt | ||
cd mysql-connector-c/mysql-connector-c && $(MAKE) clean || true | ||
cd mysql-connector-c/mysql-connector-c && rm -f CMakeCache.txt |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
--- ./CMakeLists.txt 2020-02-27 15:01:10.993225716 +0100 | ||
+++ ./CMakeLists.txt 2020-02-27 15:00:57.705257256 +0100 | ||
@@ -132,8 +132,8 @@ | ||
# Disable dbug information for release builds | ||
SET(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -DDBUG_OFF") | ||
SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -DDBUG_OFF") | ||
-SET(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} -DDBUG_OFF") | ||
-SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -DDBUG_OFF") | ||
+SET(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} -DDBUG_OFF -ggdb -O0") | ||
+SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -DDBUG_OFF -ggdb -O0") | ||
|
||
IF(CMAKE_COMPILER_IS_GNUCC) | ||
INCLUDE(CheckCCompilerFlag) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
--- cmake/ConnectorName.cmake 2020-10-29 22:16:20.000000000 +0000 | ||
+++ cmake/ConnectorName.cmake 2022-11-06 08:31:22.615513943 +0000 | ||
@@ -22,7 +22,7 @@ | ||
SET(MACHINE_NAME "x64") | ||
ELSE() | ||
SET(MACHINE_NAME "32") | ||
- END() | ||
+ ENDIF() | ||
ENDIF() | ||
|
||
SET(product_name "mysql-connector-c-${CPACK_PACKAGE_VERSION}-${PLATFORM_NAME}${CONCAT_SIGN}${MACHINE_NAME}") |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
mariadb-connector-c-3.1.9 |
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,16 @@ | ||
--- ./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) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
--- 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() | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
mysql-connector-c-6.1.11-src |
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters