diff options
| -rw-r--r-- | RepositoryExternal.mk | 37 | ||||
| -rw-r--r-- | config_host.mk.in | 1 | ||||
| -rw-r--r-- | configure.ac | 42 | ||||
| -rw-r--r-- | connectivity/Library_mysqlc.mk | 2 |
4 files changed, 0 insertions, 82 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index dfcd99963389..78b511a3f124 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -297,43 +297,6 @@ endef endif -ifneq ($(SYSTEM_MYSQL_CONNECTOR_CPP),) - -define gb_LinkTarget__use_mysql-connector-cpp -$(call gb_LinkTarget_add_libs,$(1),\ - -lmysqlcppconn \ -) - -$(call gb_LinkTarget_add_defs,$(1),\ - -DSYSTEM_MYSQL_CPPCONN \ -) -endef - -else - -$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OXT,\ - mysqlcppconn \ -)) - -# note: this does not link mysqlcppconn, it is loaded via osl_loadModuleRelative -define gb_LinkTarget__use_mysql-connector-cpp - -$(call gb_LinkTarget_use_unpacked,$(1),mysql-connector-cpp) - -$(call gb_LinkTarget_add_defs,$(1),\ - -DCPPCONN_LIB_BUILD \ -) - -$(call gb_LinkTarget_set_include,$(1),\ - -I$(call gb_UnpackedTarball_get_dir,mysql-connector-cpp) \ - -I$(call gb_UnpackedTarball_get_dir,mysql-connector-cpp)/cppconn \ - $$(INCLUDE) \ -) - -endef - -endif - ifneq ($(SYSTEM_ZLIB),) define gb_LinkTarget__use_zlib diff --git a/config_host.mk.in b/config_host.mk.in index e5fffdb72121..dcf044d4ea12 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -549,7 +549,6 @@ export SYSTEM_MDDS=@SYSTEM_MDDS@ export SYSTEM_MARIADB_CONNECTOR_C=@SYSTEM_MARIADB_CONNECTOR_C@ export SYSTEM_MSPUB=@SYSTEM_MSPUB@ export SYSTEM_MWAW=@SYSTEM_MWAW@ -export SYSTEM_MYSQL_CONNECTOR_CPP=@SYSTEM_MYSQL_CONNECTOR_CPP@ export SYSTEM_MYTHES=@SYSTEM_MYTHES@ export SYSTEM_NEON=@SYSTEM_NEON@ export SYSTEM_NSS=@SYSTEM_NSS@ diff --git a/configure.ac b/configure.ac index 8d19fefed306..87cc6f16b52b 100644 --- a/configure.ac +++ b/configure.ac @@ -8214,49 +8214,7 @@ if test "$ENABLE_MARIADBC" = "TRUE"; then AC_SUBST(LIBMARIADB) AC_SUBST(LIBMARIADB_PATH) AC_SUBST(BUNDLE_MARIADB_CONNECTOR_C) - - AC_LANG_PUSH([C++]) - dnl =================================================================== - dnl Check for system MySQL C++ Connector - dnl =================================================================== - # FIXME! - # who thought this too-generic cppconn dir was a good idea? - AC_MSG_CHECKING([MySQL Connector/C++]) - if test "$with_system_mysql_cppconn" = "yes"; then - AC_MSG_RESULT([external]) - SYSTEM_MYSQL_CONNECTOR_CPP=TRUE - AC_LANG_PUSH([C++]) - AC_CHECK_HEADER(mysql_driver.h, [], - [AC_MSG_ERROR(mysql_driver.h not found. install MySQL C++ Connectivity)], []) - AC_CHECK_LIB([mysqlcppconn], [main], [:], - [AC_MSG_ERROR(MySQL C++ Connectivity lib not found or functional)], []) - save_LIBS=$LIBS - LIBS="$LIBS -lmysqlcppconn" - AC_MSG_CHECKING([version]) - AC_RUN_IFELSE([AC_LANG_SOURCE([[ -#include <mysql_driver.h> - -int main(int argc, char **argv) { - sql::Driver *driver; - driver = get_driver_instance(); - if (driver->getMajorVersion() > 1 || \ - (driver->getMajorVersion() == 1 && driver->getMinorVersion() > 0) || \ - (driver->getMajorVersion() == 1 && driver->getMinorVersion() == 0 && driver->getPatchVersion() >= 6)) - return 0; - else - return 1; -} - ]])],[AC_MSG_RESULT(OK)],[AC_MSG_ERROR([not suitable, we need >= 1.0.6])],[AC_MSG_ERROR([MySQL C++ Connecter not tested with cross-compilation])]) - - AC_LANG_POP([C++]) - LIBS=$save_LIBS - else - AC_MSG_RESULT([internal]) - SYSTEM_MYSQL_CONNECTOR_CPP= - fi - AC_LANG_POP([C++]) fi -AC_SUBST(SYSTEM_MYSQL_CONNECTOR_CPP) dnl =================================================================== dnl Check for system hsqldb diff --git a/connectivity/Library_mysqlc.mk b/connectivity/Library_mysqlc.mk index bd705d2ee04b..26add5bee4cc 100644 --- a/connectivity/Library_mysqlc.mk +++ b/connectivity/Library_mysqlc.mk @@ -25,13 +25,11 @@ $(eval $(call gb_Library_set_include,mysqlc,\ -I$(WORKDIR)/YaccTarget/connectivity/source/parse \ )) -ifeq ($(SYSTEM_MYSQL_CONNECTOR_CPP),) $(eval $(call gb_Library_add_libs,mysqlc,\ $(if $(filter-out WNT,$(OS)),$(if $(filter MACOSX SOLARIS,$(OS)),-lz -lm,\ -rdynamic -lz -lcrypt -lnsl -lm)) \ $(if $(filter LINUX,$(OS)),-lpthread -ldl,) \ )) -endif $(eval $(call gb_Library_use_sdk_api,mysqlc)) |