diff options
| author | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2013-03-06 11:45:50 +0100 |
|---|---|---|
| committer | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2013-03-06 11:46:04 +0100 |
| commit | 1bf4306c3967560948f22630ff8f76c268a9c8bd (patch) | |
| tree | 763c9f201d9f8a20b6990e8d74b01f3bc4fcaf50 /mysqlcppconn | |
| parent | 499e53a95e79b175037ec9264d34e2ca6f7e692a (diff) | |
Switch from libmysqlc library to mariadb-native-client
Change-Id: I867918bbb61b289e1ad8752e6f46705af6e85b7c
Diffstat (limited to 'mysqlcppconn')
| -rw-r--r-- | mysqlcppconn/Library_mysqlcppconn.mk | 8 | ||||
| -rw-r--r-- | mysqlcppconn/UnpackedTarball_mysqlcppconn.mk | 4 | ||||
| -rw-r--r-- | mysqlcppconn/patches/mysql-connector-c++-1.1.0.patch | 13 |
3 files changed, 23 insertions, 2 deletions
diff --git a/mysqlcppconn/Library_mysqlcppconn.mk b/mysqlcppconn/Library_mysqlcppconn.mk index 7d932da9742b..ccb121d407dc 100644 --- a/mysqlcppconn/Library_mysqlcppconn.mk +++ b/mysqlcppconn/Library_mysqlcppconn.mk @@ -21,6 +21,14 @@ $(eval $(call gb_Library_use_externals,mysqlcppconn, \ boost_headers \ )) +ifneq ($(OS)$(COM),WNTMSC) + +$(eval $(call gb_Library_add_libs,mysqlcppconn,\ + $(if $(filter-out MACOSX,$(OS)),-ldl) \ +)) + +endif + $(eval $(call gb_Library_set_warnings_not_errors,mysqlcppconn)) $(eval $(call gb_Library_set_generated_cxx_suffix,mysqlcppconn,cpp)) diff --git a/mysqlcppconn/UnpackedTarball_mysqlcppconn.mk b/mysqlcppconn/UnpackedTarball_mysqlcppconn.mk index 542c384c4364..eeca11ed357b 100644 --- a/mysqlcppconn/UnpackedTarball_mysqlcppconn.mk +++ b/mysqlcppconn/UnpackedTarball_mysqlcppconn.mk @@ -13,14 +13,14 @@ $(eval $(call gb_UnpackedTarball_set_tarball,mysqlcppconn,$(MYSQLCPPCONN_TARBALL $(eval $(call gb_UnpackedTarball_add_file,mysqlcppconn,cppconn/config.h,mysqlcppconn/config.h)) -ifeq ($(SYSTEM_MYSQL),YES) +ifeq ($(SYSTEM_MARIADB),YES) $(eval $(call gb_UnpackedTarball_add_file,mysqlcppconn,driver/nativeapi/binding_config.h,mysqlcppconn/binding_static.h)) else $(eval $(call gb_UnpackedTarball_add_file,mysqlcppconn,driver/nativeapi/binding_config.h,mysqlcppconn/binding_dynamic.h)) endif $(eval $(call gb_UnpackedTarball_add_patches,mysqlcppconn,\ mysqlcppconn/patches/mysql-connector-c++-1.1.0.patch \ - $(if $(filter NO,$(SYSTEM_MYSQL)), \ + $(if $(filter NO,$(SYSTEM_MARIADB)), \ mysqlcppconn/patches/mysql-connector-c++-1.1.0-mysql-binding-dynamic.patch) \ mysqlcppconn/patches/default_to_protocol_tcp.patch \ )) diff --git a/mysqlcppconn/patches/mysql-connector-c++-1.1.0.patch b/mysqlcppconn/patches/mysql-connector-c++-1.1.0.patch index 722aa92132e9..c7fd21b58ba5 100644 --- a/mysqlcppconn/patches/mysql-connector-c++-1.1.0.patch +++ b/mysqlcppconn/patches/mysql-connector-c++-1.1.0.patch @@ -101,4 +101,17 @@ #include <stack> #include "mysql_util.h" +--- misc/mysql-connector-c++-1.1.0/driver/mysql_prepared_statement.cpp 2013-03-06 10:29:26.890721534 +0100 ++++ misc/build/mysql-connector-c++-1.1.0/driver/mysql_prepared_statement.cpp 2013-03-06 10:32:02.979904080 +0100 +@@ -46,6 +46,10 @@ + + #include "mysql_debug.h" + ++#ifndef CR_INVALID_BUFFER_USE ++#define CR_INVALID_BUFFER_USE 2035 ++#endif ++ + + namespace sql + { |