[Libreoffice-commits] core.git: config_host.mk.in configure.ac connectivity/Library_mysqlc.mk RepositoryExternal.mk

[Libreoffice Gerrit user]

 RepositoryExternal.mk          |   37 ------------------------------------
 config_host.mk.in              |    1 
 configure.ac                   |   42 -----------------------------------------
 connectivity/Library_mysqlc.mk |    2 -
 4 files changed, 82 deletions(-)

New commits:
commit 5061663ce052087c6d5d0910d6f99358e26dbbd1
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Sun Aug 26 14:55:45 2018 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Sun Aug 26 17:51:51 2018 +0200

    drop unnecessary SYSTEM_MYSQL_CONNECTOR_CPP
    
    Change-Id: I41cfbf41247270d29e08e5125adc05aac198b175
    Reviewed-on: https://gerrit.libreoffice.org/59608
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index f0acedbf654e..fa19152cd6fb 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 38872e2330ae..17c1341c29a5 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -566,7 +566,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 f6f25837bcbb..efce45dbd370 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8413,49 +8413,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 6f4430b74cb8..e57f84aaf57f 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 -lm)) \
 	$(if $(filter LINUX,$(OS)),-lpthread -ldl,) \
 ))
-endif
 
 $(eval $(call gb_Library_use_sdk_api,mysqlc))